summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-08-09 18:30:16 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-08-09 18:30:16 +0900
commita68fefe0d2f364ac3d8497ef37dcad713c261103 (patch)
treec46135d82a71a8d9f5c5a88f7d15de502928e112
parent25da496f3978e7ea40472e167dedf8e8e45ad031 (diff)
downloadlinux-3.10-a68fefe0d2f364ac3d8497ef37dcad713c261103.tar.gz
linux-3.10-a68fefe0d2f364ac3d8497ef37dcad713c261103.tar.bz2
linux-3.10-a68fefe0d2f364ac3d8497ef37dcad713c261103.zip
ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
This patch fixes on missing s3c-sdhci card detection method for hsmmc3. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-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 9f0f63ddd66..b18587b1ec5 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)
void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
{
+ struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
unsigned int gpio;
/* 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)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
}
- s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
- s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2));
+ if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+ s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
+ s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2));
+ }
}