From a25354806f1fc5b7a053e3712139c1ebe713b9ed Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Mon, 9 Aug 2010 18:30:16 +0900 Subject: [PATCH] --- yaml --- r: 208809 b: refs/heads/master c: a68fefe0d2f364ac3d8497ef37dcad713c261103 h: refs/heads/master i: 208807: 7fcf78dd0cc843e4c734f4baf2c8b7e86b931769 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 51750051acca..dc7658a33023 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25da496f3978e7ea40472e167dedf8e8e45ad031 +refs/heads/master: a68fefe0d2f364ac3d8497ef37dcad713c261103 diff --git a/trunk/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/trunk/arch/arm/mach-s5pv210/setup-sdhci-gpio.c index 9f0f63ddd66a..b18587b1ec58 100644 --- a/trunk/arch/arm/mach-s5pv210/setup-sdhci-gpio.c +++ b/trunk/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)); + } }