aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/setup-keypad.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-exynos/setup-keypad.c')
-rw-r--r--arch/arm/mach-exynos/setup-keypad.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/setup-keypad.c b/arch/arm/mach-exynos/setup-keypad.c
index 2163904..b26235b 100644
--- a/arch/arm/mach-exynos/setup-keypad.c
+++ b/arch/arm/mach-exynos/setup-keypad.c
@@ -17,6 +17,16 @@ void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
{
/* Keypads can be of various combinations, Just making sure */
+#if defined(CONFIG_MACH_M0_GRANDECTC) || defined(CONFIG_MACH_IRON)
+ s3c_gpio_cfgpin(EXYNOS4_GPX2(2), S3C_GPIO_SFN(3));
+ s3c_gpio_setpull(EXYNOS4_GPX2(2), S3C_GPIO_PULL_UP);
+ s3c_gpio_cfgpin(EXYNOS4_GPX2(4), S3C_GPIO_SFN(3));
+ s3c_gpio_setpull(EXYNOS4_GPX2(4), S3C_GPIO_PULL_UP);
+ s3c_gpio_cfgpin(EXYNOS4_GPX3(0), S3C_GPIO_SFN(3));
+ s3c_gpio_setpull(EXYNOS4_GPX3(0), S3C_GPIO_PULL_UP);
+ s3c_gpio_cfgall_range(EXYNOS4_GPX3(3), 2, S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);
+ s3c_gpio_cfgall_range(EXYNOS4_GPL2(3), 5, S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+#else
if (rows > 8) {
/* Set all the necessary GPX2 pins: KP_ROW[0~7] */
s3c_gpio_cfgall_range(EXYNOS4_GPX2(0), 8,
@@ -33,4 +43,5 @@ void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
/* Set all the necessary GPX1 pins to special-function 3: KP_COL[x] */
s3c_gpio_cfgrange_nopull(EXYNOS4_GPX1(0), cols, S3C_GPIO_SFN(3));
+#endif
}