aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci-gpio.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index 9f0f63ddd66a..b18587b1ec58 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -115,6 +115,7 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
115 115
116void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width) 116void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
117{ 117{
118 struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
118 unsigned int gpio; 119 unsigned int gpio;
119 120
120 /* Set all the necessary GPG3[0:2] pins to special-function 2 */ 121 /* Set all the necessary GPG3[0:2] pins to special-function 2 */
@@ -129,6 +130,8 @@ void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
129 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); 130 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
130 } 131 }
131 132
132 s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP); 133 if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
133 s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2)); 134 s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
135 s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2));
136 }
134} 137}