aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-10-26 06:55:58 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2009-11-14 04:29:12 -0500
commit24fb84222e21f413d3541f4fad76495954b3c858 (patch)
tree24219733c3afbb6a6911471939d58dc82dfd9670 /arch/arm/mach-mx3
parent50f349e9fcd069bfc76f238c0c6069aedbdbc385 (diff)
ARM: MX3: Add pad config for MMC pins on lilly-db
Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/mx31lilly-db.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mx31lilly-db.c b/arch/arm/mach-mx3/mx31lilly-db.c
index 60f2d15ff4dd..bb1e44f5d30b 100644
--- a/arch/arm/mach-mx3/mx31lilly-db.c
+++ b/arch/arm/mach-mx3/mx31lilly-db.c
@@ -111,6 +111,9 @@ static int mxc_mmc1_get_ro(struct device *dev)
111 111
112static int gpio_det, gpio_wp; 112static int gpio_det, gpio_wp;
113 113
114#define MMC_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
115 PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
116
114static int mxc_mmc1_init(struct device *dev, 117static int mxc_mmc1_init(struct device *dev,
115 irq_handler_t detect_irq, void *data) 118 irq_handler_t detect_irq, void *data)
116{ 119{
@@ -119,6 +122,13 @@ static int mxc_mmc1_init(struct device *dev,
119 gpio_det = IOMUX_TO_GPIO(MX31_PIN_GPIO1_1); 122 gpio_det = IOMUX_TO_GPIO(MX31_PIN_GPIO1_1);
120 gpio_wp = IOMUX_TO_GPIO(MX31_PIN_LCS0); 123 gpio_wp = IOMUX_TO_GPIO(MX31_PIN_LCS0);
121 124
125 mxc_iomux_set_pad(MX31_PIN_SD1_DATA0, MMC_PAD_CFG);
126 mxc_iomux_set_pad(MX31_PIN_SD1_DATA1, MMC_PAD_CFG);
127 mxc_iomux_set_pad(MX31_PIN_SD1_DATA2, MMC_PAD_CFG);
128 mxc_iomux_set_pad(MX31_PIN_SD1_DATA3, MMC_PAD_CFG);
129 mxc_iomux_set_pad(MX31_PIN_SD1_CLK, MMC_PAD_CFG);
130 mxc_iomux_set_pad(MX31_PIN_SD1_CMD, MMC_PAD_CFG);
131
122 ret = gpio_request(gpio_det, "MMC detect"); 132 ret = gpio_request(gpio_det, "MMC detect");
123 if (ret) 133 if (ret)
124 return ret; 134 return ret;