aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-27 04:25:45 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-10-22 22:51:37 -0400
commit2a1309b493ba6f42e9931a785c4eca7275bc2357 (patch)
tree99c620b09b59950c7c8f6eb38f7b9c73a8da7503
parente594ea3e48579fb1908eea4dc70184e3ba74cb9d (diff)
ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull()
Change code setting special-function and no pull-up to use the s3c_gpio_cfgrange_nopull() wrapper. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c64xx/setup-sdhci-gpio.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c b/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c
index 4262f78a93ca..6eac071afae2 100644
--- a/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c
@@ -26,8 +26,7 @@ void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
26 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; 26 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
27 27
28 /* Set all the necessary GPG pins to special-function 2 */ 28 /* Set all the necessary GPG pins to special-function 2 */
29 s3c_gpio_cfgall_range(S3C64XX_GPG(0), 2 + width, 29 s3c_gpio_cfgrange_nopull(S3C64XX_GPG(0), 2 + width, S3C_GPIO_SFN(2));
30 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
31 30
32 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { 31 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
33 s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP); 32 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)
40 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; 39 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
41 40
42 /* Set all the necessary GPH pins to special-function 2 */ 41 /* Set all the necessary GPH pins to special-function 2 */
43 s3c_gpio_cfgall_range(S3C64XX_GPH(0), 2 + width, 42 s3c_gpio_cfgrange_nopull(S3C64XX_GPH(0), 2 + width, S3C_GPIO_SFN(2));
44 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
45 43
46 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { 44 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
47 s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP); 45 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)
52void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width) 50void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
53{ 51{
54 /* Set all the necessary GPH pins to special-function 3 */ 52 /* Set all the necessary GPH pins to special-function 3 */
55 s3c_gpio_cfgall_range(S3C64XX_GPH(6), width, 53 s3c_gpio_cfgrange_nopull(S3C64XX_GPH(6), width, S3C_GPIO_SFN(3));
56 S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
57 54
58 /* Set all the necessary GPC pins to special-function 3 */ 55 /* Set all the necessary GPC pins to special-function 3 */
59 s3c_gpio_cfgall_range(S3C64XX_GPC(4), 2, 56 s3c_gpio_cfgrange_nopull(S3C64XX_GPC(4), 2, S3C_GPIO_SFN(3));
60 S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
61} 57}