diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 12:23:11 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 09:00:34 +0200 |
| commit | a2ceeef59f8fc9303dd23ebe09e9daca70799ff5 (patch) | |
| tree | c25571df25c4693880cfb5548a86c2f706766939 /arch/arm/mach-mx3/mach-mx31lite.c | |
| parent | 0e7a29a8d97c4ea86b9975e65f554c0398a8fdbf (diff) | |
| download | linux-3.10-a2ceeef59f8fc9303dd23ebe09e9daca70799ff5.tar.gz linux-3.10-a2ceeef59f8fc9303dd23ebe09e9daca70799ff5.tar.bz2 linux-3.10-a2ceeef59f8fc9303dd23ebe09e9daca70799ff5.zip | |
ARM: imx: Change the way nand devices are registered (imx31)
Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-mx31lite.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx31lite.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c index edcc7114e82..f0a68e64e00 100644 --- a/arch/arm/mach-mx3/mach-mx31lite.c +++ b/arch/arm/mach-mx3/mach-mx31lite.c @@ -41,11 +41,11 @@ #include <mach/imx-uart.h> #include <mach/iomux-mx3.h> #include <mach/irqs.h> -#include <mach/mxc_nand.h> #include <mach/spi.h> #include <mach/mxc_ehci.h> #include <mach/ulpi.h> +#include "devices-imx31.h" #include "devices.h" /* @@ -65,7 +65,8 @@ static unsigned int mx31lite_pins[] = { MX31_PIN_CSPI2_SS2__SS2, }; -static struct mxc_nand_platform_data mx31lite_nand_board_info = { +static const struct mxc_nand_platform_data +mx31lite_nand_board_info __initconst = { .width = 1, .hw_ecc = 1, }; @@ -249,7 +250,7 @@ static void __init mxc_board_init(void) /* NOR and NAND flash */ platform_device_register(&physmap_flash_device); - mxc_register_device(&mxc_nand_device, &mx31lite_nand_board_info); + imx31_add_mxc_nand(&mx31lite_nand_board_info); mxc_register_device(&mxc_spi_device1, &spi1_pdata); spi_register_board_info(&mc13783_spi_dev, 1); |