Merge branch 'sprd/dt' into next/dt

[linux-2.6-block.git] / arch / arm / boot / dts / armada-375-db.dts

diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index e4ecd7e7564460d5c870ecbb6fdc92202829aa6c..0e679465cbb5dde0cdf57e4a401838d3d61c8b78 100644 (file)
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -103,28 +103,38 @@
        nr-ports = <2>;
 };
 
-&nand {
+&nand_controller {
+       status = "okay";
        pinctrl-0 = <&nand_pins>;
        pinctrl-names = "default";
-       status = "okay";
-       num-cs = <1>;
-       marvell,nand-keep-config;
-       marvell,nand-enable-arbiter;
-       nand-on-flash-bbt;
-       nand-ecc-strength = <4>;
-       nand-ecc-step-size = <512>;
-
-       partition@0 {
-               label = "U-Boot";
-               reg = <0 0x800000>;
-       };
-       partition@800000 {
-               label = "Linux";
-               reg = <0x800000 0x800000>;
-       };
-       partition@1000000 {
-               label = "Filesystem";
-               reg = <0x1000000 0x3f000000>;
+
+       nand@0 {
+               reg = <0>;
+               label = "pxa3xx_nand-0";
+               nand-rb = <0>;
+               marvell,nand-keep-config;
+               nand-on-flash-bbt;
+               nand-ecc-strength = <4>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "U-Boot";
+                               reg = <0 0x800000>;
+                       };
+                       partition@800000 {
+                               label = "Linux";
+                               reg = <0x800000 0x800000>;
+                       };
+                       partition@1000000 {
+                               label = "Filesystem";
+                               reg = <0x1000000 0x3f000000>;
+                       };
+               };
        };
 };