Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / arm / mach-s5pv210 / setup-sdhci-gpio.c

diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index f5499ae..746777d 100644 (file)
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -28,18 +28,15 @@ 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:
                /* GPG1[3:6] special-funtion 3 */
-               s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
-                                     S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+               s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
        case 4:
                /* GPG0[3:6] special-funtion 2 */
-               s3c_gpio_cfgall_range(S5PV210_GPG0(3), 4,
-                                     S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+               s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
        default:
                break;
        }
@@ -55,12 +52,10 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
 
        /* Set all the necessary GPG1[0:1] pins to special-function 2 */
-       s3c_gpio_cfgall_range(S5PV210_GPG1(0), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
 
        /* Data pin GPG1[3:6] to special-function 2 */
-       s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
 
        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
                s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
@@ -73,18 +68,15 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
 
        /* Set all the necessary GPG2[0:1] pins to special-function 2 */
-       s3c_gpio_cfgall_range(S5PV210_GPG2(0), 2,
-                             S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+       s3c_gpio_cfgrange_nopull(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
 
        switch (width) {
        case 8:
                /* Data pin GPG3[3:6] to special-function 3 */
-               s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
-                                     S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
+               s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
        case 4:
                /* Data pin GPG2[3:6] to special-function 2 */
-               s3c_gpio_cfgall_range(S5PV210_GPG2(3), 4,
-                                     S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
+               s3c_gpio_cfgrange_nopull(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
        default:
                break;
        }
@@ -100,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);