Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: armada-xp: enable buffer manager support on Armada XP boards

Since mvneta driver supports using hardware buffer management (BM), in
order to use it, board files have to be adjusted accordingly. This commit
enables BM on AXP-DB and AXP-GP in same manner - because number of ports
on those boards is the same as number of possible pools, each port is
supposed to use single pool for all kind of packets.

Moreover appropriate entry is added to 'soc' node ranges, as well as "okay"
status for 'bm' and 'bm-bppi' (internal SRAM) nodes.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Marcin Wojtas and committed by
David S. Miller
9dd7a57e ebae1376

+36 -2
+18 -1
arch/arm/boot/dts/armada-xp-db.dts
··· 77 77 MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000 78 78 MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000 79 79 MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000 80 - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>; 80 + MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000 81 + MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>; 81 82 82 83 devbus-bootcs { 83 84 status = "okay"; ··· 182 181 status = "okay"; 183 182 phy = <&phy0>; 184 183 phy-mode = "rgmii-id"; 184 + buffer-manager = <&bm>; 185 + bm,pool-long = <0>; 185 186 }; 186 187 ethernet@74000 { 187 188 status = "okay"; 188 189 phy = <&phy1>; 189 190 phy-mode = "rgmii-id"; 191 + buffer-manager = <&bm>; 192 + bm,pool-long = <1>; 190 193 }; 191 194 ethernet@30000 { 192 195 status = "okay"; 193 196 phy = <&phy2>; 194 197 phy-mode = "sgmii"; 198 + buffer-manager = <&bm>; 199 + bm,pool-long = <2>; 195 200 }; 196 201 ethernet@34000 { 197 202 status = "okay"; 198 203 phy = <&phy3>; 199 204 phy-mode = "sgmii"; 205 + buffer-manager = <&bm>; 206 + bm,pool-long = <3>; 207 + }; 208 + 209 + bm@c0000 { 210 + status = "okay"; 200 211 }; 201 212 202 213 mvsdio@d4000 { ··· 242 229 spi-max-frequency = <20000000>; 243 230 }; 244 231 }; 232 + }; 233 + 234 + bm-bppi { 235 + status = "okay"; 245 236 }; 246 237 }; 247 238 };
+18 -1
arch/arm/boot/dts/armada-xp-gp.dts
··· 96 96 MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000 97 97 MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000 98 98 MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000 99 - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>; 99 + MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000 100 + MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>; 100 101 101 102 devbus-bootcs { 102 103 status = "okay"; ··· 197 196 status = "okay"; 198 197 phy = <&phy0>; 199 198 phy-mode = "qsgmii"; 199 + buffer-manager = <&bm>; 200 + bm,pool-long = <0>; 200 201 }; 201 202 ethernet@74000 { 202 203 status = "okay"; 203 204 phy = <&phy1>; 204 205 phy-mode = "qsgmii"; 206 + buffer-manager = <&bm>; 207 + bm,pool-long = <1>; 205 208 }; 206 209 ethernet@30000 { 207 210 status = "okay"; 208 211 phy = <&phy2>; 209 212 phy-mode = "qsgmii"; 213 + buffer-manager = <&bm>; 214 + bm,pool-long = <2>; 210 215 }; 211 216 ethernet@34000 { 212 217 status = "okay"; 213 218 phy = <&phy3>; 214 219 phy-mode = "qsgmii"; 220 + buffer-manager = <&bm>; 221 + bm,pool-long = <3>; 215 222 }; 216 223 217 224 /* Front-side USB slot */ ··· 244 235 }; 245 236 }; 246 237 238 + bm@c0000 { 239 + status = "okay"; 240 + }; 241 + 247 242 nand@d0000 { 248 243 status = "okay"; 249 244 num-cs = <1>; ··· 255 242 marvell,nand-enable-arbiter; 256 243 nand-on-flash-bbt; 257 244 }; 245 + }; 246 + 247 + bm-bppi { 248 + status = "okay"; 258 249 }; 259 250 }; 260 251 };