diff options
| author | Uwe Kleine-König | 2010-06-16 12:26:53 +0200 |
|---|---|---|
| committer | Uwe Kleine-König | 2010-06-30 09:00:35 +0200 |
| commit | e2611ba40a937b8a749ef075a67e40acee5d1748 (patch) | |
| tree | d412b52d70683583b12c6b215138703efe31c5d9 /arch/arm/mach-mx3/mach-pcm043.c | |
| parent | ARM: imx: Change the way nand devices are registered (imx31) (diff) | |
| download | kernel-qcow2-linux-e2611ba40a937b8a749ef075a67e40acee5d1748.tar.gz kernel-qcow2-linux-e2611ba40a937b8a749ef075a67e40acee5d1748.tar.xz kernel-qcow2-linux-e2611ba40a937b8a749ef075a67e40acee5d1748.zip | |
ARM: imx: Change the way nand devices are registered (imx35)
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-pcm043.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index 100bb773c69f..58de3055b85e 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c @@ -43,12 +43,12 @@ #include <mach/iomux-mx35.h> #include <mach/ipu.h> #include <mach/mx3fb.h> -#include <mach/mxc_nand.h> #include <mach/mxc_ehci.h> #include <mach/ulpi.h> #include <mach/audmux.h> #include <mach/ssi.h> +#include "devices-imx35.h" #include "devices.h" static const struct fb_videomode fb_modedb[] = { @@ -300,7 +300,8 @@ static struct imx_ssi_platform_data pcm043_ssi_pdata = { .flags = IMX_SSI_USE_AC97, }; -static struct mxc_nand_platform_data pcm037_nand_board_info = { +static const struct mxc_nand_platform_data +pcm037_nand_board_info __initconst = { .width = 1, .hw_ecc = 1, }; @@ -358,7 +359,7 @@ static void __init mxc_board_init(void) platform_add_devices(devices, ARRAY_SIZE(devices)); mxc_register_device(&mxc_uart_device0, &uart_pdata); - mxc_register_device(&mxc_nand_device, &pcm037_nand_board_info); + imx35_add_mxc_nand(&pcm037_nand_board_info); mxc_register_device(&imx_ssi_device0, &pcm043_ssi_pdata); mxc_register_device(&mxc_uart_device1, &uart_pdata); |