MIPS: TXx9: Add mtd support

[linux-2.6-omap-h63xx.git] / arch / mips / txx9 / generic / setup.c

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index fa88aefea9ef247832f2278be176ec896ea7175a..cfa3ccf493bb1d36a645d582c74d12d93ca5761d 100644 (file)
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -22,6 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/mtd/physmap.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
 #include <asm/reboot.h>
@@ -68,7 +69,12 @@ unsigned int txx9_master_clock;
 unsigned int txx9_cpu_clock;
 unsigned int txx9_gbus_clock;
 
+#ifdef CONFIG_CPU_TX39XX
+/* don't enable by default - see errata */
+int txx9_ccfg_toeon __initdata;
+#else
 int txx9_ccfg_toeon __initdata = 1;
+#endif
 
 /* Minimum CLK support */
 
@@ -315,6 +321,12 @@ static void __init preprocess_cmdline(void)
                } else if (strcmp(str, "dcdisable") == 0) {
                        txx9_dc_disable = 1;
                        continue;
+               } else if (strcmp(str, "toeoff") == 0) {
+                       txx9_ccfg_toeon = 0;
+                       continue;
+               } else if (strcmp(str, "toeon") == 0) {
+                       txx9_ccfg_toeon = 1;
+                       continue;
                }
                if (arcs_cmdline[0])
                        strcat(arcs_cmdline, " ");
@@ -582,3 +594,43 @@ static unsigned long __swizzle_addr_none(unsigned long port)
 unsigned long (*__swizzle_addr_b)(unsigned long port) = __swizzle_addr_none;
 EXPORT_SYMBOL(__swizzle_addr_b);
 #endif
+
+void __init txx9_physmap_flash_init(int no, unsigned long addr,
+                                   unsigned long size,
+                                   const struct physmap_flash_data *pdata)
+{
+#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+       struct resource res = {
+               .start = addr,
+               .end = addr + size - 1,
+               .flags = IORESOURCE_MEM,
+       };
+       struct platform_device *pdev;
+#ifdef CONFIG_MTD_PARTITIONS
+       static struct mtd_partition parts[2];
+       struct physmap_flash_data pdata_part;
+
+       /* If this area contained boot area, make separate partition */
+       if (pdata->nr_parts == 0 && !pdata->parts &&
+           addr < 0x1fc00000 && addr + size > 0x1fc00000 &&
+           !parts[0].name) {
+               parts[0].name = "boot";
+               parts[0].offset = 0x1fc00000 - addr;
+               parts[0].size = addr + size - 0x1fc00000;
+               parts[1].name = "user";
+               parts[1].offset = 0;
+               parts[1].size = 0x1fc00000 - addr;
+               pdata_part = *pdata;
+               pdata_part.nr_parts = ARRAY_SIZE(parts);
+               pdata_part.parts = parts;
+               pdata = &pdata_part;
+       }
+#endif
+       pdev = platform_device_alloc("physmap-flash", no);
+       if (!pdev ||
+           platform_device_add_resources(pdev, &res, 1) ||
+           platform_device_add_data(pdev, pdata, sizeof(*pdata)) ||
+           platform_device_add(pdev))
+               platform_device_put(pdev);
+#endif
+}