From 4942948db740ac953860215b1318ec32e2b976dd Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 27 May 2010 17:25:45 +0900 Subject: [PATCH] --- yaml --- r: 221116 b: refs/heads/master c: 2a1309b493ba6f42e9931a785c4eca7275bc2357 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4ff757370c86..a67b4d7d7bb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e594ea3e48579fb1908eea4dc70184e3ba74cb9d +refs/heads/master: 2a1309b493ba6f42e9931a785c4eca7275bc2357 diff --git a/trunk/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c b/trunk/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c index 4262f78a93ca..6eac071afae2 100644 --- a/trunk/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c +++ b/trunk/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c @@ -26,8 +26,7 @@ void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; /* Set all the necessary GPG pins to special-function 2 */ - s3c_gpio_cfgall_range(S3C64XX_GPG(0), 2 + width, - S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgrange_nopull(S3C64XX_GPG(0), 2 + width, S3C_GPIO_SFN(2)); if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP); @@ -40,8 +39,7 @@ void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width) struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; /* Set all the necessary GPH pins to special-function 2 */ - s3c_gpio_cfgall_range(S3C64XX_GPH(0), 2 + width, - S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgrange_nopull(S3C64XX_GPH(0), 2 + width, S3C_GPIO_SFN(2)); if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP); @@ -52,10 +50,8 @@ void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width) void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width) { /* Set all the necessary GPH pins to special-function 3 */ - s3c_gpio_cfgall_range(S3C64XX_GPH(6), width, - S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgrange_nopull(S3C64XX_GPH(6), width, S3C_GPIO_SFN(3)); /* Set all the necessary GPC pins to special-function 3 */ - s3c_gpio_cfgall_range(S3C64XX_GPC(4), 2, - S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgrange_nopull(S3C64XX_GPC(4), 2, S3C_GPIO_SFN(3)); }