diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 01:35:31 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 03:00:33 -0400 |
commit | 0e7a29a8d97c4ea86b9975e65f554c0398a8fdbf (patch) | |
tree | 3f29051d620eb0dd446e22713382c01e8fab3ed5 /arch/arm/mach-imx/mach-mx27ads.c | |
parent | b0c4845c47bce6fefe5e08b1e0cbd100d62ec36b (diff) |
ARM: imx: Change the way nand devices are registered (imx27)
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-imx/mach-mx27ads.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index 186b93a8c08e..1a3ebf5dab26 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <mach/imxfb.h> | 35 | #include <mach/imxfb.h> |
36 | #include <mach/mmc.h> | 36 | #include <mach/mmc.h> |
37 | 37 | ||
38 | #include "devices-imx27.h" | ||
38 | #include "devices.h" | 39 | #include "devices.h" |
39 | 40 | ||
40 | /* | 41 | /* |
@@ -166,7 +167,8 @@ static unsigned int mx27ads_pins[] = { | |||
166 | PB9_PF_SD2_CLK, | 167 | PB9_PF_SD2_CLK, |
167 | }; | 168 | }; |
168 | 169 | ||
169 | static struct mxc_nand_platform_data mx27ads_nand_board_info = { | 170 | static const struct mxc_nand_platform_data |
171 | mx27ads_nand_board_info __initconst = { | ||
170 | .width = 1, | 172 | .width = 1, |
171 | .hw_ecc = 1, | 173 | .hw_ecc = 1, |
172 | }; | 174 | }; |
@@ -315,7 +317,7 @@ static void __init mx27ads_board_init(void) | |||
315 | mxc_register_device(&imx2x_uart_device3, &uart_pdata[3]); | 317 | mxc_register_device(&imx2x_uart_device3, &uart_pdata[3]); |
316 | mxc_register_device(&imx2x_uart_device4, &uart_pdata[4]); | 318 | mxc_register_device(&imx2x_uart_device4, &uart_pdata[4]); |
317 | mxc_register_device(&imx2x_uart_device5, &uart_pdata[5]); | 319 | mxc_register_device(&imx2x_uart_device5, &uart_pdata[5]); |
318 | mxc_register_device(&imx27_nand_device, &mx27ads_nand_board_info); | 320 | imx27_add_mxc_nand(&mx27ads_nand_board_info); |
319 | 321 | ||
320 | /* only the i2c master 1 is used on this CPU card */ | 322 | /* only the i2c master 1 is used on this CPU card */ |
321 | i2c_register_board_info(1, mx27ads_i2c_devices, | 323 | i2c_register_board_info(1, mx27ads_i2c_devices, |