ARM: OMAP2+: dts: add n8x0 onenand

Convert onenand to DT on n8x0 boards.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index c5396933d02685b4c6a878a28e9b4e74f164a77f..89608b2065198f06107d5aa4be9125c228bde663 100644 (file)
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -32,3 +32,68 @@ &i2c1 {
 &i2c2 {
        clock-frequency = <400000>;
 };
+
+&gpmc {
+       ranges = <0 0 0x04000000 0x10000000>;
+
+       /* gpio-irq for dma: 26 */
+
+       onenand@0,0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               reg = <0 0 0x10000000>;
+
+               gpmc,sync-read;
+               gpmc,burst-length = <16>;
+               gpmc,burst-read;
+               gpmc,burst-wrap;
+               gpmc,device-width = <2>;
+               gpmc,mux-add-data = <2>;
+               gpmc,cs-on-ns = <0>;
+               gpmc,cs-rd-off-ns = <127>;
+               gpmc,cs-wr-off-ns = <109>;
+               gpmc,adv-on-ns = <0>;
+               gpmc,adv-rd-off-ns = <18>;
+               gpmc,adv-wr-off-ns = <18>;
+               gpmc,oe-on-ns = <27>;
+               gpmc,oe-off-ns = <127>;
+               gpmc,we-on-ns = <27>;
+               gpmc,we-off-ns = <72>;
+               gpmc,rd-cycle-ns = <145>;
+               gpmc,wr-cycle-ns = <136>;
+               gpmc,access-ns = <118>;
+               gpmc,page-burst-access-ns = <27>;
+               gpmc,bus-turnaround-ns = <0>;
+               gpmc,cycle2cycle-delay-ns = <0>;
+               gpmc,wait-monitoring-ns = <0>;
+               gpmc,clk-activation-ns = <9>;
+               gpmc,sync-clk-ps = <27000>;
+
+               /* MTD partition table corresponding to old board-n8x0 file. */
+               partition@0 {
+                       label = "bootloader";
+                       reg = <0x00000000 0x00020000>;
+                       read-only;
+               };
+               partition@1 {
+                       label = "config";
+                       reg = <0x00020000 0x00060000>;
+               };
+               partition@2 {
+                       label = "kernel";
+                       reg = <0x00080000 0x00200000>;
+               };
+               partition@3 {
+                       label = "initfs";
+                       reg = <0x00280000 0x00400000>;
+               };
+               partition@4 {
+                       label = "rootfs";
+                       reg = <0x00680000 0x0f980000>;
+               };
+               partition@5 {
+                       label = "omap2-onenand";
+                       reg = <0x00000000 0x10000000>;
+               };
+       };
+};

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index d596571d775037ae858d44d32321b03ca7ddef45..aead77a4bc6dc34d75a16a80631ce8ff9d703bf4 100644 (file)
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -162,49 +162,6 @@ static struct spi_board_info n800_spi_board_info[] __initdata = {
        },
 };
 
-#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
-       defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
-
-static struct mtd_partition onenand_partitions[] = {
-       {
-               .name           = "bootloader",
-               .offset         = 0,
-               .size           = 0x20000,
-               .mask_flags     = MTD_WRITEABLE,        /* Force read-only */
-       },
-       {
-               .name           = "config",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 0x60000,
-       },
-       {
-               .name           = "kernel",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 0x200000,
-       },
-       {
-               .name           = "initfs",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 0x400000,
-       },
-       {
-               .name           = "rootfs",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct omap_onenand_platform_data board_onenand_data[] = {
-       {
-               .cs             = 0,
-               .gpio_irq       = 26,
-               .parts          = onenand_partitions,
-               .nr_parts       = ARRAY_SIZE(onenand_partitions),
-               .flags          = ONENAND_SYNC_READ,
-       }
-};
-#endif
-
 #if defined(CONFIG_MENELAUS) &&                                                \
        (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE))
 
@@ -639,7 +596,6 @@ static int __init n8x0_late_initcall(void)
        if (!board_caps)
                return -ENODEV;
 
-       gpmc_onenand_init(board_onenand_data);
        n8x0_mmc_init();
        n8x0_usb_init();