aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-07-18 02:33:26 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2008-07-28 05:28:53 -0400
commit2809fc06f2fc0aac180644cabf9330e50f015bbb (patch)
tree1a37ee3769187119454170ac95911f6187ced782
parent221d62c1882d05fc20163347d7e6af279bdffb8e (diff)
[ARM] mx1ads: make mmc platform data available for modules
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/mx1ads.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index 9635d5812bcd..baeff24ff02d 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -125,7 +125,7 @@ static struct platform_device *devices[] __initdata = {
125 &imx_uart2_device, 125 &imx_uart2_device,
126}; 126};
127 127
128#ifdef CONFIG_MMC_IMX 128#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE)
129static int mx1ads_mmc_card_present(struct device *dev) 129static int mx1ads_mmc_card_present(struct device *dev)
130{ 130{
131 /* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */ 131 /* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */
@@ -143,7 +143,7 @@ mx1ads_init(void)
143#ifdef CONFIG_LEDS 143#ifdef CONFIG_LEDS
144 imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2); 144 imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);
145#endif 145#endif
146#ifdef CONFIG_MMC_IMX 146#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE)
147 /* SD/MMC card detect */ 147 /* SD/MMC card detect */
148 imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20); 148 imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20);
149 imx_set_mmc_info(&mx1ads_mmc_info); 149 imx_set_mmc_info(&mx1ads_mmc_info);