Merge "mpq8064: fix target id and keypad detect"