]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ARM: u300: add FSMC flash into the device tree
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 22 Apr 2013 09:00:02 +0000 (11:00 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 17 Jun 2013 11:54:29 +0000 (13:54 +0200)
This registers the U300 FSMC flash controller from the
device tree, and defines the three partitions. Skip the
BBT scan as in the current platform data.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/boot/dts/ste-u300.dts
arch/arm/mach-u300/core.c

index 1b20769d261a0ff5374a62cfacd9377ca2745705..b8a8ddb5abff25da4b617d8126c019d41e6ae236 100644 (file)
                dma-channels = <40>;
        };
 
+       /* A NAND flash of 128 MiB */
+       fsmc: flash@40000000 {
+               compatible = "stericsson,fsmc-nand";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               reg = <0x9f800000 0x1000>,      /* FSMC Register*/
+                       <0x80000000 0x4000>,    /* NAND Base DATA */
+                       <0x80020000 0x4000>,    /* NAND Base ADDR */
+                       <0x80010000 0x4000>;    /* NAND Base CMD */
+               reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
+               nand-skip-bbtscan;
+
+               partition@0 {
+               label = "boot records";
+                       reg = <0x0 0x20000>;
+               };
+               partition@20000 {
+                       label = "free";
+                       reg = <0x20000 0x7e0000>;
+               };
+               partition@800000 {
+                       label = "platform";
+                       reg = <0x800000 0xf800000>;
+               };
+       };
+
        i2c0: i2c@c0004000 {
                compatible = "st,ddci2c";
                reg = <0xc0004000 0x1000>;
index d102cb501f8dce90dfa35f1e9e74bace3c2e6da8..8f9e77aea76aac7ff3f2b3e2d0b00910fed6d539 100644 (file)
@@ -733,6 +733,8 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = {
                "rtc-coh901331", NULL),
        OF_DEV_AUXDATA("stericsson,coh901318", U300_DMAC_BASE,
                "coh901318", NULL),
+       OF_DEV_AUXDATA("stericsson,fsmc-nand", U300_NAND_IF_PHYS_BASE,
+               "fsmc-nand", NULL),
        OF_DEV_AUXDATA("arm,primecell", U300_UART0_BASE,
                "uart0", &uart0_plat_data),
        OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,