diff options
-rw-r--r-- | arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/setup-keypad.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c64xx/setup-fb-24bpp.c b/arch/arm/mach-s3c64xx/setup-fb-24bpp.c index 3b0dd124d49a..8f3091182f9c 100644 --- a/arch/arm/mach-s3c64xx/setup-fb-24bpp.c +++ b/arch/arm/mach-s3c64xx/setup-fb-24bpp.c | |||
@@ -23,9 +23,6 @@ | |||
23 | 23 | ||
24 | extern void s3c64xx_fb_gpio_setup_24bpp(void) | 24 | extern void s3c64xx_fb_gpio_setup_24bpp(void) |
25 | { | 25 | { |
26 | s3c_gpio_cfgall_range(S3C64XX_GPI(0), 16, | 26 | s3c_gpio_cfgrange_nopull(S3C64XX_GPI(0), 16, S3C_GPIO_SFN(2)); |
27 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | 27 | s3c_gpio_cfgrange_nopull(S3C64XX_GPJ(0), 12, S3C_GPIO_SFN(2)); |
28 | |||
29 | s3c_gpio_cfgall_range(S3C64XX_GPJ(0), 12, | ||
30 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | ||
31 | } | 28 | } |
diff --git a/arch/arm/mach-s3c64xx/setup-keypad.c b/arch/arm/mach-s3c64xx/setup-keypad.c index cc9b09c335f3..d1fd7228ee75 100644 --- a/arch/arm/mach-s3c64xx/setup-keypad.c +++ b/arch/arm/mach-s3c64xx/setup-keypad.c | |||
@@ -16,10 +16,8 @@ | |||
16 | void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) | 16 | void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) |
17 | { | 17 | { |
18 | /* Set all the necessary GPK pins to special-function 3: KP_ROW[x] */ | 18 | /* Set all the necessary GPK pins to special-function 3: KP_ROW[x] */ |
19 | s3c_gpio_cfgall_range(S3C64XX_GPK(8), 8 + rows, | 19 | s3c_gpio_cfgrange_nopull(S3C64XX_GPK(8), 8 + rows, S3C_GPIO_SFN(3)); |
20 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE); | ||
21 | 20 | ||
22 | /* Set all the necessary GPL pins to special-function 3: KP_COL[x] */ | 21 | /* Set all the necessary GPL pins to special-function 3: KP_COL[x] */ |
23 | s3c_gpio_cfgall_range(S3C64XX_GPL(0), cols, | 22 | s3c_gpio_cfgrange_nopull(S3C64XX_GPL(0), cols, S3C_GPIO_SFN(3)); |
24 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE); | ||
25 | } | 23 | } |