projects / openwrt / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
tools: mkimage: provide dtc path during build
[openwrt/openwrt.git] / target / linux / mvebu / patches-4.4 / 054-ARM-dts-armada-38x-enable-buffer-manager-support-on-.patch
1 From c49e99c2b25a412623412a461bb751239208b9b3 Mon Sep 17 00:00:00 2001
2 From: Marcin Wojtas <mw@semihalf.com>
3 Date: Mon, 14 Mar 2016 09:38:58 +0100
4 Subject: [PATCH] ARM: dts: armada-38x: enable buffer manager support on Armada
5 38x boards
6
7 Since mvneta driver supports using hardware buffer management (BM), in
8 order to use it, board files have to be adjusted accordingly. This commit
9 enables BM on:
10 * A385-DB-AP - each port has its own pool for long and common pool for
11 short packets,
12 * A388-ClearFog - same as above,
13 * A388-DB - to each port unique 'short' and 'long' pools are mapped,
14 * A388-GP - same as above.
15
16 Moreover appropriate entry is added to 'soc' node ranges, as well as "okay"
17 status for 'bm' and 'bm-bppi' (internal SRAM) nodes.
18
19 [gregory.clement@free-electrons.com: add suppport for the ClearFog board]
20
21 Signed-off-by: Marcin Wojtas <mw@semihalf.com>
22 Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
23 Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
24 Signed-off-by: David S. Miller <davem@davemloft.net>
25 ---
26 arch/arm/boot/dts/armada-385-db-ap.dts | 20 +++++++++++++++++++-
27 arch/arm/boot/dts/armada-388-clearfog.dts | 6 ++++++
28 arch/arm/boot/dts/armada-388-db.dts | 17 ++++++++++++++++-
29 arch/arm/boot/dts/armada-388-gp.dts | 17 ++++++++++++++++-
30 arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 15 ++++++++++++++-
31 5 files changed, 71 insertions(+), 4 deletions(-)
32
33 --- a/arch/arm/boot/dts/armada-385-db-ap.dts
34 +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
35 @@ -61,7 +61,8 @@
36 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
37 MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
38 MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
39 - MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
40 + MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
41 + MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
42
43 internal-regs {
44 spi1: spi@10680 {
45 @@ -138,12 +139,18 @@
46 status = "okay";
47 phy = <&phy2>;
48 phy-mode = "sgmii";
49 + buffer-manager = <&bm>;
50 + bm,pool-long = <1>;
51 + bm,pool-short = <3>;
52 };
53
54 ethernet@34000 {
55 status = "okay";
56 phy = <&phy1>;
57 phy-mode = "sgmii";
58 + buffer-manager = <&bm>;
59 + bm,pool-long = <2>;
60 + bm,pool-short = <3>;
61 };
62
63 ethernet@70000 {
64 @@ -157,6 +164,13 @@
65 status = "okay";
66 phy = <&phy0>;
67 phy-mode = "rgmii-id";
68 + buffer-manager = <&bm>;
69 + bm,pool-long = <0>;
70 + bm,pool-short = <3>;
71 + };
72 +
73 + bm@c8000 {
74 + status = "okay";
75 };
76
77 nfc: flash@d0000 {
78 @@ -178,6 +192,10 @@
79 };
80 };
81
82 + bm-bppi {
83 + status = "okay";
84 + };
85 +
86 pcie-controller {
87 status = "okay";
88
89 --- a/arch/arm/boot/dts/armada-388-clearfog.dts
90 +++ b/arch/arm/boot/dts/armada-388-clearfog.dts
91 @@ -78,6 +78,9 @@
92 internal-regs {
93 ethernet@30000 {
94 phy-mode = "sgmii";
95 + buffer-manager = <&bm>;
96 + bm,pool-long = <2>;
97 + bm,pool-short = <1>;
98 status = "okay";
99
100 fixed-link {
101 @@ -88,6 +91,9 @@
102
103 ethernet@34000 {
104 phy-mode = "sgmii";
105 + buffer-manager = <&bm>;
106 + bm,pool-long = <3>;
107 + bm,pool-short = <1>;
108 status = "okay";
109
110 fixed-link {
111 --- a/arch/arm/boot/dts/armada-388-db.dts
112 +++ b/arch/arm/boot/dts/armada-388-db.dts
113 @@ -66,7 +66,8 @@
114 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
115 MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
116 MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
117 - MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
118 + MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
119 + MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
120
121 internal-regs {
122 spi@10600 {
123 @@ -99,6 +100,9 @@
124 status = "okay";
125 phy = <&phy1>;
126 phy-mode = "rgmii-id";
127 + buffer-manager = <&bm>;
128 + bm,pool-long = <2>;
129 + bm,pool-short = <3>;
130 };
131
132 usb@58000 {
133 @@ -109,6 +113,9 @@
134 status = "okay";
135 phy = <&phy0>;
136 phy-mode = "rgmii-id";
137 + buffer-manager = <&bm>;
138 + bm,pool-long = <0>;
139 + bm,pool-short = <1>;
140 };
141
142 mdio@72004 {
143 @@ -129,6 +136,10 @@
144 status = "okay";
145 };
146
147 + bm@c8000 {
148 + status = "okay";
149 + };
150 +
151 flash@d0000 {
152 status = "okay";
153 num-cs = <1>;
154 @@ -169,6 +180,10 @@
155 };
156 };
157
158 + bm-bppi {
159 + status = "okay";
160 + };
161 +
162 pcie-controller {
163 status = "okay";
164 /*
165 --- a/arch/arm/boot/dts/armada-388-gp.dts
166 +++ b/arch/arm/boot/dts/armada-388-gp.dts
167 @@ -60,7 +60,8 @@
168 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
169 MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
170 MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
171 - MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
172 + MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
173 + MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
174
175 internal-regs {
176 spi@10600 {
177 @@ -133,6 +134,9 @@
178 status = "okay";
179 phy = <&phy1>;
180 phy-mode = "rgmii-id";
181 + buffer-manager = <&bm>;
182 + bm,pool-long = <2>;
183 + bm,pool-short = <3>;
184 };
185
186 /* CON4 */
187 @@ -152,6 +156,9 @@
188 status = "okay";
189 phy = <&phy0>;
190 phy-mode = "rgmii-id";
191 + buffer-manager = <&bm>;
192 + bm,pool-long = <0>;
193 + bm,pool-short = <1>;
194 };
195
196
197 @@ -186,6 +193,10 @@
198 };
199 };
200
201 + bm@c8000 {
202 + status = "okay";
203 + };
204 +
205 sata@e0000 {
206 pinctrl-names = "default";
207 pinctrl-0 = <&sata2_pins>, <&sata3_pins>;
208 @@ -240,6 +251,10 @@
209 };
210 };
211
212 + bm-bppi {
213 + status = "okay";
214 + };
215 +
216 pcie-controller {
217 status = "okay";
218 /*
219 --- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
220 +++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
221 @@ -58,7 +58,8 @@
222 ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
223 MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
224 MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
225 - MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
226 + MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
227 + MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
228
229 internal-regs {
230 ethernet@70000 {
231 @@ -66,6 +67,9 @@
232 pinctrl-names = "default";
233 phy = <&phy_dedicated>;
234 phy-mode = "rgmii-id";
235 + buffer-manager = <&bm>;
236 + bm,pool-long = <0>;
237 + bm,pool-short = <1>;
238 status = "okay";
239 };
240
241 @@ -110,6 +114,15 @@
242 pinctrl-names = "default";
243 status = "okay";
244 };
245 +
246 + bm@c8000 {
247 + status = "okay";
248 + };
249 };
250 +
251 + bm-bppi {
252 + status = "okay";
253 + };
254 +
255 };
256 };
OpenWrt Source Repository