diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-01 07:10:33 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-22 22:52:15 -0400 |
commit | 20dbc43dd33a35ee24b6892d980c5e6107a27d32 (patch) | |
tree | d06894f0a233f01cc17eafe2c3b43a1d7d0a3b88 /arch | |
parent | 3e9b7261502e78e351fc6a61a9b7241433c779c4 (diff) |
ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull()
This patch changes code setting special-function and no pull-up
to use the s3c_gpio_cfgrange_nopull() wrapper.
NOTE: This is for missed things from the previous patch.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s5pc100/setup-fb-24bpp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/setup-ide.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/setup-keypad.c | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-s5pc100/setup-fb-24bpp.c b/arch/arm/mach-s5pc100/setup-fb-24bpp.c index 5a882d46c3f5..d31c0f3fe222 100644 --- a/arch/arm/mach-s5pc100/setup-fb-24bpp.c +++ b/arch/arm/mach-s5pc100/setup-fb-24bpp.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | static void s5pc100_fb_setgpios(unsigned int base, unsigned int nr) | 25 | static void s5pc100_fb_setgpios(unsigned int base, unsigned int nr) |
26 | { | 26 | { |
27 | s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | 27 | s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2)); |
28 | } | 28 | } |
29 | 29 | ||
30 | void s5pc100_fb_gpio_setup_24bpp(void) | 30 | void s5pc100_fb_gpio_setup_24bpp(void) |
diff --git a/arch/arm/mach-s5pc100/setup-ide.c b/arch/arm/mach-s5pc100/setup-ide.c index d8b0d0eac139..223aae044466 100644 --- a/arch/arm/mach-s5pc100/setup-ide.c +++ b/arch/arm/mach-s5pc100/setup-ide.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | static void s5pc100_ide_cfg_gpios(unsigned int base, unsigned int nr) | 20 | static void s5pc100_ide_cfg_gpios(unsigned int base, unsigned int nr) |
21 | { | 21 | { |
22 | s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(4), S3C_GPIO_PULL_NONE); | 22 | s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4)); |
23 | 23 | ||
24 | for (; nr > 0; nr--, base++) | 24 | for (; nr > 0; nr--, base++) |
25 | s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4); | 25 | s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4); |
@@ -49,8 +49,7 @@ void s5pc100_ide_setup_gpio(void) | |||
49 | s3c_gpio_cfgpin_range(S5PC100_GPK0(6), 2, S3C_GPIO_SFN(0)); | 49 | s3c_gpio_cfgpin_range(S5PC100_GPK0(6), 2, S3C_GPIO_SFN(0)); |
50 | 50 | ||
51 | /* CF_OE, CF_WE */ | 51 | /* CF_OE, CF_WE */ |
52 | s3c_gpio_cfgall_range(S5PC100_GPK1(6), 8, | 52 | s3c_gpio_cfgrange_nopull(S5PC100_GPK1(6), 8, S3C_GPIO_SFN(2)); |
53 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | ||
54 | 53 | ||
55 | /* CF_CD */ | 54 | /* CF_CD */ |
56 | s3c_gpio_cfgpin(S5PC100_GPK3(5), S3C_GPIO_SFN(2)); | 55 | s3c_gpio_cfgpin(S5PC100_GPK3(5), S3C_GPIO_SFN(2)); |
diff --git a/arch/arm/mach-s5pc100/setup-keypad.c b/arch/arm/mach-s5pc100/setup-keypad.c index 966b49f0e281..ada377f0c206 100644 --- a/arch/arm/mach-s5pc100/setup-keypad.c +++ b/arch/arm/mach-s5pc100/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 GPH3 pins to special-function 3: KP_ROW[x] */ | 18 | /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */ |
19 | s3c_gpio_cfgall_range(S5PC100_GPH3(0), rows, | 19 | s3c_gpio_cfgrange_nopull(S5PC100_GPH3(0), rows, S3C_GPIO_SFN(3)); |
20 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE); | ||
21 | 20 | ||
22 | /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */ | 21 | /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */ |
23 | s3c_gpio_cfgall_range(S5PC100_GPH2(0), cols, | 22 | s3c_gpio_cfgrange_nopull(S5PC100_GPH2(0), cols, S3C_GPIO_SFN(3)); |
24 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE); | ||
25 | } | 23 | } |