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

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

diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index ebe1d267406df5ab30e3a3189b669733eb8fcaa4..62422a90aeb25a640eef04c74051d664db4bb7b9 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -77,7 +77,8 @@
                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
+                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                         MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
 
                devbus-bootcs {
                        status = "okay";
@@ -181,21 +182,33 @@
                                status = "okay";
                                phy = <&phy0>;
                                phy-mode = "rgmii-id";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <0>;
                        };
                        ethernet@74000 {
                                status = "okay";
                                phy = <&phy1>;
                                phy-mode = "rgmii-id";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <1>;
                        };
                        ethernet@30000 {
                                status = "okay";
                                phy = <&phy2>;
                                phy-mode = "sgmii";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <2>;
                        };
                        ethernet@34000 {
                                status = "okay";
                                phy = <&phy3>;
                                phy-mode = "sgmii";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <3>;
+                       };
+
+                       bm@c0000 {
+                               status = "okay";
                        };
 
                        mvsdio@d4000 {
@@ -229,6 +242,38 @@
                                        spi-max-frequency = <20000000>;
                                };
                        };
+
+                       nand@d0000 {
+                               status = "okay";
+                               num-cs = <1>;
+                               marvell,nand-keep-config;
+                               marvell,nand-enable-arbiter;
+                               nand-on-flash-bbt;
+
+                               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>;
+
+                                       };
+                               };
+                       };
+               };
+
+               bm-bppi {
+                       status = "okay";
                };
        };
 };