1 files changed, 40 insertions, 7 deletions

diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index fe7d86dad14c..b18587b1ec58 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -15,15 +15,17 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 
-#include <mach/gpio.h>
 #include <plat/gpio-cfg.h>
 #include <plat/regs-sdhci.h>
+#include <plat/sdhci.h>
 
 void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
 {
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
         unsigned int gpio;
 
         /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
@@ -48,12 +50,15 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
                 break;
         }
 
-        s3c_gpio_setpull(S5PV210_GPG0(2), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgpin(S5PV210_GPG0(2), S3C_GPIO_SFN(2));
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                s3c_gpio_setpull(S5PV210_GPG0(2), S3C_GPIO_PULL_UP);
+                s3c_gpio_cfgpin(S5PV210_GPG0(2), S3C_GPIO_SFN(2));
+        }
 }
 
 void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
 {
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
         unsigned int gpio;
 
         /* Set all the necessary GPG1[0:1] pins to special-function 2 */
@@ -68,12 +73,15 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
                 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
         }
 
-        s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgpin(S5PV210_GPG1(2), S3C_GPIO_SFN(2));
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
+                s3c_gpio_cfgpin(S5PV210_GPG1(2), S3C_GPIO_SFN(2));
+        }
 }
 
 void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
 {
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
         unsigned int gpio;
 
         /* Set all the necessary GPG2[0:1] pins to special-function 2 */
@@ -99,6 +107,31 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
                 break;
         }
 
-        s3c_gpio_setpull(S5PV210_GPG2(2), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgpin(S5PV210_GPG2(2), S3C_GPIO_SFN(2));
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                s3c_gpio_setpull(S5PV210_GPG2(2), S3C_GPIO_PULL_UP);
+                s3c_gpio_cfgpin(S5PV210_GPG2(2), S3C_GPIO_SFN(2));
+        }
+}
+
+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 */
+        for (gpio = S5PV210_GPG3(0); gpio < S5PV210_GPG3(2); gpio++) {
+                s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
+                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        }
+
+        /* Data pin GPG3[3:6] to special-function 2 */
+        for (gpio = S5PV210_GPG3(3); gpio <= S5PV210_GPG3(6); gpio++) {
+                s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
+                s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
+        }
+
+        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));
+        }
 }