Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / arch / arm / mach-nomadik / board-nhk8815.c

diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 79bdea943eb4bcc1299f2fd68a887c1d01f111fd..6bfd537d5afbeba3f4518c5381f3711cac5d9311 100644 (file)
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -16,12 +16,164 @@
 #include <linux/amba/bus.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/io.h>
+#include <asm/sizes.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 #include <mach/setup.h>
+#include <mach/nand.h>
+#include <mach/fsmc.h>
 #include "clock.h"
 
+/* These adresses span 16MB, so use three individual pages */
+static struct resource nhk8815_nand_resources[] = {
+       {
+               .name = "nand_addr",
+               .start = NAND_IO_ADDR,
+               .end = NAND_IO_ADDR + 0xfff,
+               .flags = IORESOURCE_MEM,
+       }, {
+               .name = "nand_cmd",
+               .start = NAND_IO_CMD,
+               .end = NAND_IO_CMD + 0xfff,
+               .flags = IORESOURCE_MEM,
+       }, {
+               .name = "nand_data",
+               .start = NAND_IO_DATA,
+               .end = NAND_IO_DATA + 0xfff,
+               .flags = IORESOURCE_MEM,
+       }
+};
+
+static int nhk8815_nand_init(void)
+{
+       /* FSMC setup for nand chip select (8-bit nand in 8815NHK) */
+       writel(0x0000000E, FSMC_PCR(0));
+       writel(0x000D0A00, FSMC_PMEM(0));
+       writel(0x00100A00, FSMC_PATT(0));
+
+       /* enable access to the chip select area */
+       writel(readl(FSMC_PCR(0)) | 0x04, FSMC_PCR(0));
+
+       return 0;
+}
+
+/*
+ * These partitions are the same as those used in the 2.6.20 release
+ * shipped by the vendor; the first two partitions are mandated
+ * by the boot ROM, and the bootloader area is somehow oversized...
+ */
+static struct mtd_partition nhk8815_partitions[] = {
+       {
+               .name   = "X-Loader(NAND)",
+               .offset = 0,
+               .size   = SZ_256K,
+       }, {
+               .name   = "MemInit(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_256K,
+       }, {
+               .name   = "BootLoader(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_2M,
+       }, {
+               .name   = "Kernel zImage(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 3 * SZ_1M,
+       }, {
+               .name   = "Root Filesystem(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 22 * SZ_1M,
+       }, {
+               .name   = "User Filesystem(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct nomadik_nand_platform_data nhk8815_nand_data = {
+       .parts          = nhk8815_partitions,
+       .nparts         = ARRAY_SIZE(nhk8815_partitions),
+       .options        = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \
+                       | NAND_NO_READRDY | NAND_NO_AUTOINCR,
+       .init           = nhk8815_nand_init,
+};
+
+static struct platform_device nhk8815_nand_device = {
+       .name           = "nomadik_nand",
+       .dev            = {
+               .platform_data = &nhk8815_nand_data,
+       },
+       .resource       = nhk8815_nand_resources,
+       .num_resources  = ARRAY_SIZE(nhk8815_nand_resources),
+};
+
+/* These are the partitions for the OneNand device, different from above */
+static struct mtd_partition nhk8815_onenand_partitions[] = {
+       {
+               .name   = "X-Loader(OneNAND)",
+               .offset = 0,
+               .size   = SZ_256K,
+       }, {
+               .name   = "MemInit(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_256K,
+       }, {
+               .name   = "BootLoader(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_2M-SZ_256K,
+       }, {
+               .name   = "SysImage(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 4 * SZ_1M,
+       }, {
+               .name   = "Root Filesystem(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 22 * SZ_1M,
+       }, {
+               .name   = "User Filesystem(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct flash_platform_data nhk8815_onenand_data = {
+       .parts          = nhk8815_onenand_partitions,
+       .nr_parts       = ARRAY_SIZE(nhk8815_onenand_partitions),
+};
+
+static struct resource nhk8815_onenand_resource[] = {
+       {
+               .start          = 0x30000000,
+               .end            = 0x30000000 + SZ_128K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device nhk8815_onenand_device = {
+       .name           = "onenand",
+       .id             = -1,
+       .dev            = {
+               .platform_data  = &nhk8815_onenand_data,
+       },
+       .resource       = nhk8815_onenand_resource,
+       .num_resources  = ARRAY_SIZE(nhk8815_onenand_resource),
+};
+
+static void __init nhk8815_onenand_init(void)
+{
+#ifdef CONFIG_ONENAND
+       /* Set up SMCS0 for OneNand */
+       writel(0x000030db, FSMC_BCR0);
+       writel(0x02100551, FSMC_BTR0);
+#endif
+}
+
 #define __MEM_4K_RESOURCE(x) \
        .res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
 
@@ -81,6 +233,8 @@ static int __init nhk8815_eth_init(void)
 device_initcall(nhk8815_eth_init);
 
 static struct platform_device *nhk8815_platform_devices[] __initdata = {
+       &nhk8815_nand_device,
+       &nhk8815_onenand_device,
        &nhk8815_eth_device,
        /* will add more devices */
 };
@@ -90,6 +244,7 @@ static void __init nhk8815_platform_init(void)
        int i;
 
        cpu8815_platform_init();
+       nhk8815_onenand_init();
        platform_add_devices(nhk8815_platform_devices,
                             ARRAY_SIZE(nhk8815_platform_devices));