diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 12:34:56 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 09:00:32 +0200 |
| commit | b0c4845c47bce6fefe5e08b1e0cbd100d62ec36b (patch) | |
| tree | 409483c88a00e0ca311efb6e6b83f17461b0fed5 /arch/arm/mach-mx25/mach-mx25_3ds.c | |
| parent | 1f8d721cd3dd1a2ee37152ce228f035212074984 (diff) | |
| download | talos-op-linux-b0c4845c47bce6fefe5e08b1e0cbd100d62ec36b.tar.gz talos-op-linux-b0c4845c47bce6fefe5e08b1e0cbd100d62ec36b.zip | |
ARM: imx: Change the way nand devices are registered (imx25)
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-mx25/mach-mx25_3ds.c')
| -rw-r--r-- | arch/arm/mach-mx25/mach-mx25_3ds.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-mx25/mach-mx25_3ds.c b/arch/arm/mach-mx25/mach-mx25_3ds.c index 26ba246c57ee..e1e98864c8e7 100644 --- a/arch/arm/mach-mx25/mach-mx25_3ds.c +++ b/arch/arm/mach-mx25/mach-mx25_3ds.c @@ -40,11 +40,12 @@ #include <mach/common.h> #include <mach/imx-uart.h> #include <mach/mx25.h> -#include <mach/mxc_nand.h> #include <mach/imxfb.h> -#include "devices.h" #include <mach/iomux-mx25.h> +#include "devices-imx25.h" +#include "devices.h" + static struct imxuart_platform_data uart_pdata = { .flags = IMXUART_HAVE_RTSCTS, }; @@ -109,7 +110,8 @@ static void __init mx25pdk_fec_reset(void) gpio_set_value(FEC_RESET_B_GPIO, 1); } -static struct mxc_nand_platform_data mx25pdk_nand_board_info = { +static const struct mxc_nand_platform_data +mx25pdk_nand_board_info __initconst = { .width = 1, .hw_ecc = 1, .flash_bbt = 1, @@ -150,7 +152,7 @@ static void __init mx25pdk_init(void) mxc_register_device(&mxc_uart_device0, &uart_pdata); mxc_register_device(&mxc_usbh2, NULL); - mxc_register_device(&mxc_nand_device, &mx25pdk_nand_board_info); + imx25_add_mxc_nand(&mx25pdk_nand_board_info); mxc_register_device(&mx25_rtc_device, NULL); mxc_register_device(&mx25_fb_device, &mx25pdk_fb_pdata); |
