Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux-2.6-block.git] / arch / arm / boot / dts / armada-388-gp.dts

diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index 51943598d8585609c5c06a068b7077271ccba45a..fd75e5e9550fc2bc17d63d052a0f5e2263d219fa 100644 (file)
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -60,7 +60,8 @@
                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                          MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
-                         MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
+                         MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
+                         MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
 
                internal-regs {
                        spi@10600 {
@@ -133,6 +134,9 @@
                                status = "okay";
                                phy = <&phy1>;
                                phy-mode = "rgmii-id";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <2>;
+                               bm,pool-short = <3>;
                        };
 
                        /* CON4 */
@@ -152,6 +156,9 @@
                                status = "okay";
                                phy = <&phy0>;
                                phy-mode = "rgmii-id";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <0>;
+                               bm,pool-short = <1>;
                        };
 
 
@@ -186,6 +193,10 @@
                                };
                        };
 
+                       bm@c8000 {
+                               status = "okay";
+                       };
+
                        sata@e0000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&sata2_pins>, <&sata3_pins>;
@@ -240,6 +251,10 @@
                        };
                };
 
+               bm-bppi {
+                       status = "okay";
+               };
+
                pcie-controller {
                        status = "okay";
                        /*