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-pcm038.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-pcm038.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index b6a15bac0c3d..bc44d6faf47d 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <mach/mxc_ehci.h> | 43 | #include <mach/mxc_ehci.h> |
44 | #include <mach/ulpi.h> | 44 | #include <mach/ulpi.h> |
45 | 45 | ||
46 | #include "devices-imx27.h" | ||
46 | #include "devices.h" | 47 | #include "devices.h" |
47 | 48 | ||
48 | static int pcm038_pins[] = { | 49 | static int pcm038_pins[] = { |
@@ -172,7 +173,8 @@ static struct imxuart_platform_data uart_pdata[] = { | |||
172 | }, | 173 | }, |
173 | }; | 174 | }; |
174 | 175 | ||
175 | static struct mxc_nand_platform_data pcm038_nand_board_info = { | 176 | static const struct mxc_nand_platform_data |
177 | pcm038_nand_board_info __initconst = { | ||
176 | .width = 1, | 178 | .width = 1, |
177 | .hw_ecc = 1, | 179 | .hw_ecc = 1, |
178 | }; | 180 | }; |
@@ -310,7 +312,7 @@ static void __init pcm038_init(void) | |||
310 | mxc_register_device(&imx2x_uart_device2, &uart_pdata[2]); | 312 | mxc_register_device(&imx2x_uart_device2, &uart_pdata[2]); |
311 | 313 | ||
312 | mxc_gpio_mode(PE16_AF_OWIRE); | 314 | mxc_gpio_mode(PE16_AF_OWIRE); |
313 | mxc_register_device(&imx27_nand_device, &pcm038_nand_board_info); | 315 | imx27_add_mxc_nand(&pcm038_nand_board_info); |
314 | 316 | ||
315 | /* only the i2c master 1 is used on this CPU card */ | 317 | /* only the i2c master 1 is used on this CPU card */ |
316 | i2c_register_board_info(1, pcm038_i2c_devices, | 318 | i2c_register_board_info(1, pcm038_i2c_devices, |