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>

diff --git a/arch/arm/mach-s5pv210/setup-fb-24bpp.c b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
index a33fe96191d2233fb276c963e3b1744729ca7fd1..e932ebfac56df3159608cf61cf32042be2ee58d9 100644 (file)
--- a/arch/arm/mach-s5pv210/setup-fb-24bpp.c
+++ b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
@@ -23,7 +23,7 @@
 
 static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
 {
-       s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
 
        for (; nr > 0; nr--, base++)
                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 d7cd10f9230a5c7b86c160cb2c5c69e61f60dd47..ea123d546bd2ccb0604e809cfc2c0cd8a7c4f44a 100644 (file)
--- a/arch/arm/mach-s5pv210/setup-ide.c
+++ b/arch/arm/mach-s5pv210/setup-ide.c
@@ -17,7 +17,7 @@
 
 static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
 {
-       s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(4), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
 
        for (; nr > 0; nr--, base++)
                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 cb3f409f022c7279301e010464c0786781d26635..c56420a52f48f2e96cb9d0eb212a86b3179b0004 100644 (file)
--- a/arch/arm/mach-s5pv210/setup-keypad.c
+++ b/arch/arm/mach-s5pv210/setup-keypad.c
@@ -17,10 +17,8 @@
 void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
 {
        /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
-       s3c_gpio_cfgall_range(S5PV210_GPH3(0), rows,
-                             S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPH3(0), rows, S3C_GPIO_SFN(3));
 
        /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
-       s3c_gpio_cfgall_range(S5PV210_GPH2(0), cols,
-                             S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPH2(0), cols, S3C_GPIO_SFN(3));
 }

diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index 927d58850fcb454c830cf15b9b99f0f3b9796090..746777d56df95ab51e817227cf3c97ce4db34b62 100644 (file)
--- 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)
        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
 
        /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
-       s3c_gpio_cfgall_range(S5PV210_GPG0(0), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
 
        switch (width) {
        case 8:
@@ -93,12 +92,10 @@ void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
 
        /* Set all the necessary GPG3[0:1] pins to special-function 2 */
-       s3c_gpio_cfgall_range(S5PV210_GPG3(0), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
 
        /* Data pin GPG3[3:6] to special-function 2 */
-       s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
 
        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
                s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);