diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 06:23:11 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 03:00:34 -0400 |
commit | a2ceeef59f8fc9303dd23ebe09e9daca70799ff5 (patch) | |
tree | c25571df25c4693880cfb5548a86c2f706766939 /arch/arm/mach-mx3/mach-pcm037.c | |
parent | 0e7a29a8d97c4ea86b9975e65f554c0398a8fdbf (diff) |
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-pcm037.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index c1f335c5b2c6..d7fef469990a 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -48,10 +48,10 @@ | |||
48 | #include <mach/mmc.h> | 48 | #include <mach/mmc.h> |
49 | #include <mach/mx3_camera.h> | 49 | #include <mach/mx3_camera.h> |
50 | #include <mach/mx3fb.h> | 50 | #include <mach/mx3fb.h> |
51 | #include <mach/mxc_nand.h> | ||
52 | #include <mach/mxc_ehci.h> | 51 | #include <mach/mxc_ehci.h> |
53 | #include <mach/ulpi.h> | 52 | #include <mach/ulpi.h> |
54 | 53 | ||
54 | #include "devices-imx31.h" | ||
55 | #include "devices.h" | 55 | #include "devices.h" |
56 | #include "pcm037.h" | 56 | #include "pcm037.h" |
57 | 57 | ||
@@ -274,7 +274,8 @@ static struct platform_device pcm037_sram_device = { | |||
274 | .resource = &pcm038_sram_resource, | 274 | .resource = &pcm038_sram_resource, |
275 | }; | 275 | }; |
276 | 276 | ||
277 | static struct mxc_nand_platform_data pcm037_nand_board_info = { | 277 | static const struct mxc_nand_platform_data |
278 | pcm037_nand_board_info __initconst = { | ||
278 | .width = 1, | 279 | .width = 1, |
279 | .hw_ecc = 1, | 280 | .hw_ecc = 1, |
280 | }; | 281 | }; |
@@ -632,7 +633,7 @@ static void __init mxc_board_init(void) | |||
632 | mxc_register_device(&mxc_i2c_device1, &pcm037_i2c_1_data); | 633 | mxc_register_device(&mxc_i2c_device1, &pcm037_i2c_1_data); |
633 | mxc_register_device(&mxc_i2c_device2, &pcm037_i2c_2_data); | 634 | mxc_register_device(&mxc_i2c_device2, &pcm037_i2c_2_data); |
634 | 635 | ||
635 | mxc_register_device(&mxc_nand_device, &pcm037_nand_board_info); | 636 | imx31_add_mxc_nand(&pcm037_nand_board_info); |
636 | mxc_register_device(&mxcsdhc_device0, &sdhc_pdata); | 637 | mxc_register_device(&mxcsdhc_device0, &sdhc_pdata); |
637 | mxc_register_device(&mx3_ipu, &mx3_ipu_data); | 638 | mxc_register_device(&mx3_ipu, &mx3_ipu_data); |
638 | mxc_register_device(&mx3_fb, &mx3fb_pdata); | 639 | mxc_register_device(&mx3_fb, &mx3fb_pdata); |