aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mx31moboard-marxbot.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-12 05:10:55 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-19 15:54:35 -0500
commit6a697e3d310d79ea0e385975c57084ce22b04b36 (patch)
tree64462dc21a24ad331214e834abd30eede199d0c5 /arch/arm/mach-mx3/mx31moboard-marxbot.c
parenta528bc87841d958bbd394abc9266aee9cdf45cb8 (diff)
ARM: mx3: dynamically register mxc-mmc devices
Compared to the static devices the dynamic have a DMA resource. This should be save as it seems unused in the driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-marxbot.c')
-rw-r--r--arch/arm/mach-mx3/mx31moboard-marxbot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c
index 0551eb39d97e..075c4fb8e74c 100644
--- a/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -29,12 +29,12 @@
29#include <mach/hardware.h> 29#include <mach/hardware.h>
30#include <mach/imx-uart.h> 30#include <mach/imx-uart.h>
31#include <mach/iomux-mx3.h> 31#include <mach/iomux-mx3.h>
32#include <mach/mmc.h>
33#include <mach/mxc_ehci.h> 32#include <mach/mxc_ehci.h>
34#include <mach/ulpi.h> 33#include <mach/ulpi.h>
35 34
36#include <media/soc_camera.h> 35#include <media/soc_camera.h>
37 36
37#include "devices-imx31.h"
38#include "devices.h" 38#include "devices.h"
39 39
40static unsigned int marxbot_pins[] = { 40static unsigned int marxbot_pins[] = {
@@ -116,7 +116,7 @@ static void marxbot_sdhc2_exit(struct device *dev, void *data)
116 gpio_free(SDHC2_CD); 116 gpio_free(SDHC2_CD);
117} 117}
118 118
119static struct imxmmc_platform_data sdhc2_pdata = { 119static const struct imxmmc_platform_data sdhc2_pdata __initconst = {
120 .get_ro = marxbot_sdhc2_get_ro, 120 .get_ro = marxbot_sdhc2_get_ro,
121 .init = marxbot_sdhc2_init, 121 .init = marxbot_sdhc2_init,
122 .exit = marxbot_sdhc2_exit, 122 .exit = marxbot_sdhc2_exit,
@@ -345,7 +345,7 @@ void __init mx31moboard_marxbot_init(void)
345 345
346 dspics_resets_init(); 346 dspics_resets_init();
347 347
348 mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata); 348 imx31_add_mxc_mmc(1, &sdhc2_pdata);
349 349
350 spi_register_board_info(marxbot_spi_board_info, 350 spi_register_board_info(marxbot_spi_board_info,
351 ARRAY_SIZE(marxbot_spi_board_info)); 351 ARRAY_SIZE(marxbot_spi_board_info));