Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / armada-385-linksys.dtsi

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index df47bf1ea5eb4fbbac7559eb5b6bad47a1de47cd..2306c45685b1f14788e4e5f3e0927a7724ca554d 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -59,7 +59,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 {
                        i2c@11000 {
@@ -88,6 +89,9 @@
                        ethernet@70000 {
                                status = "okay";
                                phy-mode = "rgmii-id";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <2>;
+                               bm,pool-short = <3>;
                                fixed-link {
                                        speed = <1000>;
                                        full-duplex;
@@ -97,6 +101,9 @@
                        ethernet@34000 {
                                status = "okay";
                                phy-mode = "sgmii";
+                               buffer-manager = <&bm>;
+                               bm,pool-long = <0>;
+                               bm,pool-short = <1>;
                                fixed-link {
                                        speed = <1000>;
                                        full-duplex;
@@ -159,6 +166,10 @@
                                status = "okay";
                        };
 
+                       bm@c8000 {
+                               status = "okay";
+                       };
+
                        /* USB part of the eSATA/USB 2.0 port */
                        usb@58000 {
                                status = "okay";
@@ -241,6 +252,10 @@
                        };
                };
 
+               bm-bppi {
+                       status = "okay";
+               };
+
                pcie-controller {
                        status = "okay";
 
@@ -305,6 +320,7 @@
                sata {
                        gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
+                       linux,default-trigger = "disk-activity";
                };
        };