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-cpuimx27.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-cpuimx27.c')
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 866a99a337f2..5d07c2ab4711 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <mach/imx-uart.h> | 40 | #include <mach/imx-uart.h> |
41 | #include <mach/mxc_nand.h> | 41 | #include <mach/mxc_nand.h> |
42 | 42 | ||
43 | #include "devices-imx27.h" | ||
43 | #include "devices.h" | 44 | #include "devices.h" |
44 | 45 | ||
45 | static int eukrea_cpuimx27_pins[] = { | 46 | static int eukrea_cpuimx27_pins[] = { |
@@ -119,7 +120,8 @@ static struct imxuart_platform_data uart_pdata[] = { | |||
119 | }, | 120 | }, |
120 | }; | 121 | }; |
121 | 122 | ||
122 | static struct mxc_nand_platform_data eukrea_cpuimx27_nand_board_info = { | 123 | static const struct mxc_nand_platform_data |
124 | cpuimx27_nand_board_info __initconst = { | ||
123 | .width = 1, | 125 | .width = 1, |
124 | .hw_ecc = 1, | 126 | .hw_ecc = 1, |
125 | }; | 127 | }; |
@@ -189,8 +191,7 @@ static void __init eukrea_cpuimx27_init(void) | |||
189 | 191 | ||
190 | mxc_register_device(&imx2x_uart_device0, &uart_pdata[0]); | 192 | mxc_register_device(&imx2x_uart_device0, &uart_pdata[0]); |
191 | 193 | ||
192 | mxc_register_device(&imx27_nand_device, | 194 | imx27_add_mxc_nand(&cpuimx27_nand_board_info); |
193 | &eukrea_cpuimx27_nand_board_info); | ||
194 | 195 | ||
195 | i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, | 196 | i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, |
196 | ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); | 197 | ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); |