diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-27 04:25:46 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-22 22:51:41 -0400 |
| commit | 8f89d5b3b14ba588f744ba394b6c7f00f4dcd49a (patch) | |
| tree | bd00ce4b18df3d19c77e1d2266c835be0c1bd00b | |
| parent | 2a1309b493ba6f42e9931a785c4eca7275bc2357 (diff) | |
ARM: S5PC100: 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-s5pc100/setup-sdhci-gpio.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-s5pc100/setup-sdhci-gpio.c b/arch/arm/mach-s5pc100/setup-sdhci-gpio.c index a8d22a7b1581..03c02d04c68c 100644 --- a/arch/arm/mach-s5pc100/setup-sdhci-gpio.c +++ b/arch/arm/mach-s5pc100/setup-sdhci-gpio.c | |||
| @@ -33,12 +33,10 @@ void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) | |||
| 33 | num = width - 2; | 33 | num = width - 2; |
| 34 | 34 | ||
| 35 | /* Set all the necessary GPG0/GPG1 pins to special-function 0 */ | 35 | /* Set all the necessary GPG0/GPG1 pins to special-function 0 */ |
| 36 | s3c_gpio_cfgall_range(S5PC100_GPG0(0), 2 + num, | 36 | s3c_gpio_cfgrange_nopull(S5PC100_GPG0(0), 2 + num, S3C_GPIO_SFN(2)); |
| 37 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | ||
| 38 | 37 | ||
| 39 | if (width == 8) | 38 | if (width == 8) |
| 40 | s3c_gpio_cfgall_range(S5PC100_GPG1(0), 2, | 39 | s3c_gpio_cfgrange_nopull(S5PC100_GPG1(0), 2, S3C_GPIO_SFN(2)); |
| 41 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | ||
| 42 | 40 | ||
| 43 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | 41 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { |
| 44 | s3c_gpio_setpull(S5PC100_GPG1(2), S3C_GPIO_PULL_UP); | 42 | s3c_gpio_setpull(S5PC100_GPG1(2), S3C_GPIO_PULL_UP); |
| @@ -51,8 +49,7 @@ void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width) | |||
| 51 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; | 49 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; |
| 52 | 50 | ||
| 53 | /* Set all the necessary GPG2 pins to special-function 2 */ | 51 | /* Set all the necessary GPG2 pins to special-function 2 */ |
| 54 | s3c_gpio_cfgall_range(S5PC100_GPG2(0), 2 + width, | 52 | s3c_gpio_cfgrange_nopull(S5PC100_GPG2(0), 2 + width, S3C_GPIO_SFN(2)); |
| 55 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | ||
| 56 | 53 | ||
| 57 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | 54 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { |
| 58 | s3c_gpio_setpull(S5PC100_GPG2(6), S3C_GPIO_PULL_UP); | 55 | s3c_gpio_setpull(S5PC100_GPG2(6), S3C_GPIO_PULL_UP); |
| @@ -65,8 +62,7 @@ void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width) | |||
| 65 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; | 62 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; |
| 66 | 63 | ||
| 67 | /* Set all the necessary GPG3 pins to special-function 2 */ | 64 | /* Set all the necessary GPG3 pins to special-function 2 */ |
| 68 | s3c_gpio_cfgall_range(S5PC100_GPG3(0), 2 + width, | 65 | s3c_gpio_cfgrange_nopull(S5PC100_GPG3(0), 2 + width, S3C_GPIO_SFN(2)); |
| 69 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); | ||
| 70 | 66 | ||
| 71 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | 67 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { |
| 72 | s3c_gpio_setpull(S5PC100_GPG3(6), S3C_GPIO_PULL_UP); | 68 | s3c_gpio_setpull(S5PC100_GPG3(6), S3C_GPIO_PULL_UP); |