ARM: imx: dynamically register mxc-mmc devices

... plus a trivial simplification of mx21ads_sdhc_init()

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c
index 0c944858e884..d1a3158f1a82 100644
--- a/arch/arm/mach-imx/mach-mxt_td60.c
+++ b/arch/arm/mach-imx/mach-mxt_td60.c
@@ -31,7 +31,6 @@
 #include <mach/iomux-mx27.h>
 #include <mach/mxc_nand.h>
 #include <linux/i2c/pca953x.h>
-#include <mach/mmc.h>
 
 #include "devices-imx27.h"
 #include "devices.h"
@@ -225,7 +224,7 @@ static void mxt_td60_sdhc1_exit(struct device *dev, void *data)
         free_irq(IRQ_GPIOF(8), data);
 }
 
-static struct imxmmc_platform_data sdhc1_pdata = {
+static const struct imxmmc_platform_data sdhc1_pdata __initconst = {
         .init = mxt_td60_sdhc1_init,
         .exit = mxt_td60_sdhc1_exit,
 };
@@ -253,7 +252,7 @@ static void __init mxt_td60_board_init(void)
         imx27_add_imx_i2c(0, &mxt_td60_i2c0_data);
         imx27_add_imx_i2c(1, &mxt_td60_i2c1_data);
         imx27_add_imx_fb(&mxt_td60_fb_data);
-        mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata);
+        imx27_add_mxc_mmc(0, &sdhc1_pdata);
         imx27_add_fec(NULL);
 }