mvebu: backport upstream ethernet driver improvements and enable buffer manager support
[oweals/openwrt.git] / target / linux / mvebu / patches-4.4 / 106-enable-bm-on-linksys-devices.patch
1 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
2 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
3 @@ -59,7 +59,8 @@
4                 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
5                           MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
6                           MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
7 -                         MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
8 +                         MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
9 +                         MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
10  
11                 internal-regs {
12  
13 @@ -93,6 +94,9 @@
14                         ethernet@70000 {
15                                 status = "okay";
16                                 phy-mode = "rgmii-id";
17 +                               buffer-manager = <&bm>;
18 +                               bm,pool-long = <0>;
19 +                               bm,pool-short = <3>;
20                                 fixed-link {
21                                         speed = <1000>;
22                                         full-duplex;
23 @@ -102,6 +106,9 @@
24                         ethernet@34000 {
25                                 status = "okay";
26                                 phy-mode = "sgmii";
27 +                               buffer-manager = <&bm>;
28 +                               bm,pool-long = <2>;
29 +                               bm,pool-short = <3>;
30                                 fixed-link {
31                                         speed = <1000>;
32                                         full-duplex;
33 @@ -112,6 +119,10 @@
34                                 status = "okay";
35                         };
36  
37 +                       bm@c8000 {
38 +                               status = "okay";
39 +                       };
40 +
41                         sata@a8000 {
42                                 status = "okay";
43                         };
44 @@ -198,6 +209,10 @@
45                         };
46                 };
47  
48 +               bm-bppi {
49 +                       status = "okay";
50 +               };
51 +
52                 pcie-controller {
53                         status = "okay";
54  
55 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
56 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
57 @@ -71,7 +71,8 @@
58                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
59                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
60                           MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
61 -                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
62 +                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
63 +                         MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
64  
65                 pcie-controller {
66                         status = "okay";
67 @@ -205,6 +206,9 @@
68                                 pinctrl-names = "default";
69                                 status = "okay";
70                                 phy-mode = "rgmii-id";
71 +                               buffer-manager = <&bm>;
72 +                               bm,pool-long = <0>;
73 +                               bm,pool-short = <3>;
74                                 fixed-link {
75                                         speed = <1000>;
76                                         full-duplex;
77 @@ -216,12 +220,19 @@
78                                 pinctrl-names = "default";
79                                 status = "okay";
80                                 phy-mode = "rgmii-id";
81 +                               buffer-manager = <&bm>;
82 +                               bm,pool-long = <1>;
83 +                               bm,pool-short = <3>;
84                                 fixed-link {
85                                         speed = <1000>;
86                                         full-duplex;
87                                 };
88                         };
89  
90 +                       bm@c0000 {
91 +                               status = "okay";
92 +                       };
93 +
94                         /* USB part of the eSATA/USB 2.0 port */
95                         usb@50000 {
96                                 status = "okay";
97 @@ -379,6 +390,10 @@
98                                 };
99                         };
100                 };
101 +
102 +               bm-bppi {
103 +                       status = "okay";
104 +               };
105         };
106  
107         gpio_keys {