diff options
| author | b02247 <b02247@freescale.com> | 2012-07-04 14:50:26 +0800 |
|---|---|---|
| committer | b02247 <b02247@freescale.com> | 2012-07-04 15:53:21 +0800 |
| commit | 3572647b80497abc05f9b18aa33042a65641b611 (patch) | |
| tree | 4a8c92ffae28deaf600f87e16b9d0e93233c2dd3 | |
| parent | dba56b23388deba7686e0ac28e542bb566eb1d7c (diff) | |
ENGR00215740 Enable the Keypad
1. enable the Keypad
2. change the F5 as POWER key
Signed-off-by: b02247 <b02247@freescale.com>
Signed-off-by: Jack Lee <jacklee@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx6s_android_defconfig | 4 | ||||
| -rwxr-xr-x | arch/arm/mach-mx6/board-mx6sl_arm2.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/imx6s_android_defconfig b/arch/arm/configs/imx6s_android_defconfig index 15ed7b434069..0abe7091572f 100644 --- a/arch/arm/configs/imx6s_android_defconfig +++ b/arch/arm/configs/imx6s_android_defconfig @@ -1273,7 +1273,7 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_MCS is not set # CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_IMX is not set +CONFIG_KEYBOARD_IMX=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set @@ -1934,7 +1934,7 @@ CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y # CONFIG_FB_MXC_CH7026 is not set # CONFIG_FB_MXC_TVOUT_CH7024 is not set # CONFIG_FB_MXC_ASYNC_PANEL is not set -# CONFIG_FB_MXC_EINK_PANEL is not set +CONFIG_FB_MXC_EINK_PANEL=y # CONFIG_FB_MXC_SIPIX_PANEL is not set CONFIG_FB_MXC_ELCDIF_FB=y CONFIG_FB_MXC_HDMI=y diff --git a/arch/arm/mach-mx6/board-mx6sl_arm2.c b/arch/arm/mach-mx6/board-mx6sl_arm2.c index 78952d83e778..fe9677f1fe6b 100755 --- a/arch/arm/mach-mx6/board-mx6sl_arm2.c +++ b/arch/arm/mach-mx6/board-mx6sl_arm2.c @@ -1168,7 +1168,7 @@ static int mx6sl_arm2_keymap[] = { KEY(1, 0, KEY_F3), KEY(1, 1, KEY_F4), - KEY(1, 2, KEY_F5), + KEY(1, 2, KEY_POWER), KEY(1, 3, KEY_MENU), KEY(2, 0, KEY_PREVIOUS), |