ARM: imx: Change the way nand devices are registered (imx25)
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 16 Jun 2010 10:34:56 +0000 (12:34 +0200)
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 30 Jun 2010 07:00:32 +0000 (09:00 +0200)
Make use of new mechanism to register a nand device.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
arch/arm/mach-mx25/Kconfig
arch/arm/mach-mx25/devices-imx25.h [new file with mode: 0644]
arch/arm/mach-mx25/devices.c
arch/arm/mach-mx25/devices.h
arch/arm/mach-mx25/mach-mx25_3ds.c

index 54d217314ee9a3b57030af0f26f747d4d834e828..3c4f1eeb88e563ec059dccfbab13837711308817 100644 (file)
@@ -4,5 +4,6 @@ comment "MX25 platforms:"
 
 config MACH_MX25_3DS
        bool "Support MX25PDK (3DS) Platform"
+       select IMX_HAVE_PLATFORM_MXC_NAND
 
 endif
diff --git a/arch/arm/mach-mx25/devices-imx25.h b/arch/arm/mach-mx25/devices-imx25.h
new file mode 100644 (file)
index 0000000..f8d4ee0
--- /dev/null
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2010 Pengutronix
+ * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+#include <mach/mx25.h>
+#include <mach/devices-common.h>
+
+#define imx25_add_mxc_nand(pdata)      \
+       imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata)
index 80f31318071335f602eaafe304771a6c7a53d627..e1c3cd14078cce4f84b9aa7df06d1b88db1ff38f 100644 (file)
@@ -439,26 +439,6 @@ struct platform_device mx25_fec_device = {
        .resource       = mx25_fec_resources,
 };
 
-static struct resource mxc_nand_resources[] = {
-       {
-               .start  = MX25_NFC_BASE_ADDR,
-               .end    = MX25_NFC_BASE_ADDR + 0x1fff,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .start  = MX25_INT_NANDFC,
-               .end    = MX25_INT_NANDFC,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device mxc_nand_device = {
-       .name           = "mxc_nand",
-       .id             = 0,
-       .num_resources  = ARRAY_SIZE(mxc_nand_resources),
-       .resource       = mxc_nand_resources,
-};
-
 static struct resource mx25_rtc_resources[] = {
        {
                .start  = MX25_DRYICE_BASE_ADDR,
index cee12c0a0be68e5988fcc8f914c94705dfe92beb..f212c93648c91aa305ff9345fe8126cb74a28423 100644 (file)
@@ -18,7 +18,6 @@ extern struct platform_device mxc_i2c_device0;
 extern struct platform_device mxc_i2c_device1;
 extern struct platform_device mxc_i2c_device2;
 extern struct platform_device mx25_fec_device;
-extern struct platform_device mxc_nand_device;
 extern struct platform_device mx25_rtc_device;
 extern struct platform_device mx25_fb_device;
 extern struct platform_device mxc_wdt;
index 26ba246c57ee8daf8bde6e27f5364233320d1a61..e1e98864c8e7cfe1e3e19caf720f47a773061813 100644 (file)
 #include <mach/common.h>
 #include <mach/imx-uart.h>
 #include <mach/mx25.h>
-#include <mach/mxc_nand.h>
 #include <mach/imxfb.h>
-#include "devices.h"
 #include <mach/iomux-mx25.h>
 
+#include "devices-imx25.h"
+#include "devices.h"
+
 static struct imxuart_platform_data uart_pdata = {
        .flags = IMXUART_HAVE_RTSCTS,
 };
@@ -109,7 +110,8 @@ static void __init mx25pdk_fec_reset(void)
        gpio_set_value(FEC_RESET_B_GPIO, 1);
 }
 
-static struct mxc_nand_platform_data mx25pdk_nand_board_info = {
+static const struct mxc_nand_platform_data
+mx25pdk_nand_board_info __initconst = {
        .width          = 1,
        .hw_ecc         = 1,
        .flash_bbt      = 1,
@@ -150,7 +152,7 @@ static void __init mx25pdk_init(void)
 
        mxc_register_device(&mxc_uart_device0, &uart_pdata);
        mxc_register_device(&mxc_usbh2, NULL);
-       mxc_register_device(&mxc_nand_device, &mx25pdk_nand_board_info);
+       imx25_add_mxc_nand(&mx25pdk_nand_board_info);
        mxc_register_device(&mx25_rtc_device, NULL);
        mxc_register_device(&mx25_fb_device, &mx25pdk_fb_pdata);