aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-27 04:25:47 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-10-22 22:51:57 -0400
commit5a350da428daace38b0762b63d42f4b441e8bad4 (patch)
treec5cd41c150df6624f965cbbe265da0e0074395ce /arch/arm/mach-s5pv210/setup-sdhci-gpio.c
parent8f89d5b3b14ba588f744ba394b6c7f00f4dcd49a (diff)
ARM: S5PV210: 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>
Diffstat (limited to 'arch/arm/mach-s5pv210/setup-sdhci-gpio.c')
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci-gpio.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index f5499aeb2b6c..927d58850fcb 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -34,12 +34,10 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
34 switch (width) { 34 switch (width) {
35 case 8: 35 case 8:
36 /* GPG1[3:6] special-funtion 3 */ 36 /* GPG1[3:6] special-funtion 3 */
37 s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4, 37 s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
38 S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
39 case 4: 38 case 4:
40 /* GPG0[3:6] special-funtion 2 */ 39 /* GPG0[3:6] special-funtion 2 */
41 s3c_gpio_cfgall_range(S5PV210_GPG0(3), 4, 40 s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
42 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
43 default: 41 default:
44 break; 42 break;
45 } 43 }
@@ -55,12 +53,10 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
55 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; 53 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
56 54
57 /* Set all the necessary GPG1[0:1] pins to special-function 2 */ 55 /* Set all the necessary GPG1[0:1] pins to special-function 2 */
58 s3c_gpio_cfgall_range(S5PV210_GPG1(0), 2, 56 s3c_gpio_cfgrange_nopull(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
59 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
60 57
61 /* Data pin GPG1[3:6] to special-function 2 */ 58 /* Data pin GPG1[3:6] to special-function 2 */
62 s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4, 59 s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
63 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
64 60
65 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { 61 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
66 s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP); 62 s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
@@ -73,18 +69,15 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
73 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; 69 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
74 70
75 /* Set all the necessary GPG2[0:1] pins to special-function 2 */ 71 /* Set all the necessary GPG2[0:1] pins to special-function 2 */
76 s3c_gpio_cfgall_range(S5PV210_GPG2(0), 2, 72 s3c_gpio_cfgrange_nopull(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
77 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
78 73
79 switch (width) { 74 switch (width) {
80 case 8: 75 case 8:
81 /* Data pin GPG3[3:6] to special-function 3 */ 76 /* Data pin GPG3[3:6] to special-function 3 */
82 s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4, 77 s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
83 S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
84 case 4: 78 case 4:
85 /* Data pin GPG2[3:6] to special-function 2 */ 79 /* Data pin GPG2[3:6] to special-function 2 */
86 s3c_gpio_cfgall_range(S5PV210_GPG2(3), 4, 80 s3c_gpio_cfgrange_nopull(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
87 S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
88 default: 81 default:
89 break; 82 break;
90 } 83 }