aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-10-01 07:12:24 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-10-22 22:52:26 -0400
commita7aac9d5b037be16d4ef5b1701b83774706daf53 (patch)
tree20b6329abe6b92b11c2b0a3e237b5658c3d0ebea /arch
parent20dbc43dd33a35ee24b6892d980c5e6107a27d32 (diff)
ARM: S5PV210: 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-s5pv210/setup-fb-24bpp.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-ide.c2
-rw-r--r--arch/arm/mach-s5pv210/setup-keypad.c6
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci-gpio.c9
4 files changed, 7 insertions, 12 deletions
diff --git a/arch/arm/mach-s5pv210/setup-fb-24bpp.c b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
index a33fe96191d2..e932ebfac56d 100644
--- a/arch/arm/mach-s5pv210/setup-fb-24bpp.c
+++ b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
@@ -23,7 +23,7 @@
23 23
24static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr) 24static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
25{ 25{
26 s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); 26 s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
27 27
28 for (; nr > 0; nr--, base++) 28 for (; nr > 0; nr--, base++)
29 s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4); 29 s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
diff --git a/arch/arm/mach-s5pv210/setup-ide.c b/arch/arm/mach-s5pv210/setup-ide.c
index d7cd10f9230a..ea123d546bd2 100644
--- a/arch/arm/mach-s5pv210/setup-ide.c
+++ b/arch/arm/mach-s5pv210/setup-ide.c
@@ -17,7 +17,7 @@
17 17
18static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr) 18static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
19{ 19{
20 s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(4), S3C_GPIO_PULL_NONE); 20 s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
21 21
22 for (; nr > 0; nr--, base++) 22 for (; nr > 0; nr--, base++)
23 s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4); 23 s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
diff --git a/arch/arm/mach-s5pv210/setup-keypad.c b/arch/arm/mach-s5pv210/setup-keypad.c
index cb3f409f022c..c56420a52f48 100644
--- a/arch/arm/mach-s5pv210/setup-keypad.c
+++ b/arch/arm/mach-s5pv210/setup-keypad.c
@@ -17,10 +17,8 @@
17void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) 17void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
18{ 18{
19 /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */ 19 /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
20 s3c_gpio_cfgall_range(S5PV210_GPH3(0), rows, 20 s3c_gpio_cfgrange_nopull(S5PV210_GPH3(0), rows, S3C_GPIO_SFN(3));
21 S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
22 21
23 /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */ 22 /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
24 s3c_gpio_cfgall_range(S5PV210_GPH2(0), cols, 23 s3c_gpio_cfgrange_nopull(S5PV210_GPH2(0), cols, S3C_GPIO_SFN(3));
25 S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
26} 24}
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index 927d58850fcb..746777d56df9 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -28,8 +28,7 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
28 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; 28 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
29 29
30 /* Set all the necessary GPG0/GPG1 pins to special-function 2 */ 30 /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
31 s3c_gpio_cfgall_range(S5PV210_GPG0(0), 2, 31 s3c_gpio_cfgrange_nopull(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
32 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
33 32
34 switch (width) { 33 switch (width) {
35 case 8: 34 case 8:
@@ -93,12 +92,10 @@ void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
93 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; 92 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
94 93
95 /* Set all the necessary GPG3[0:1] pins to special-function 2 */ 94 /* Set all the necessary GPG3[0:1] pins to special-function 2 */
96 s3c_gpio_cfgall_range(S5PV210_GPG3(0), 2, 95 s3c_gpio_cfgrange_nopull(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
97 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
98 96
99 /* Data pin GPG3[3:6] to special-function 2 */ 97 /* Data pin GPG3[3:6] to special-function 2 */
100 s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4, 98 s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
101 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
102 99
103 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { 100 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
104 s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP); 101 s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);