Skip to content

Commit

Permalink
ARM: dts: armada-38x: enable buffer manager support on Armada 38x boards
Browse files Browse the repository at this point in the history 
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:
* A385-DB-AP - each port has its own pool for long and common pool for
short packets,
* A388-ClearFog - same as above,
* A388-DB - to each port unique 'short' and 'long' pools are mapped,
* A388-GP - same as above.

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

[gregory.clement@free-electrons.com: add suppport for the ClearFog board]

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Marcin Wojtas authored and David S. Miller committed Mar 14, 2016
1 parent 4a547a5 commit c49e99c
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 4 deletions.
20 changes: 19 additions & 1 deletion arch/arm/boot/dts/armada-385-db-ap.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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 {
spi1: spi@10680 {
Expand Down Expand Up @@ -138,12 +139,18 @@
status = "okay";
phy = <&phy2>;
phy-mode = "sgmii";
buffer-manager = <&bm>;
bm,pool-long = <1>;
bm,pool-short = <3>;
};

ethernet@34000 {
status = "okay";
phy = <&phy1>;
phy-mode = "sgmii";
buffer-manager = <&bm>;
bm,pool-long = <2>;
bm,pool-short = <3>;
};

ethernet@70000 {
Expand All @@ -157,6 +164,13 @@
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
bm,pool-long = <0>;
bm,pool-short = <3>;
};

bm@c8000 {
status = "okay";
};

nfc: flash@d0000 {
Expand All @@ -178,6 +192,10 @@
};
};

bm-bppi {
status = "okay";
};

pcie-controller {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/armada-388-clearfog.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
internal-regs {
ethernet@30000 {
phy-mode = "sgmii";
buffer-manager = <&bm>;
bm,pool-long = <2>;
bm,pool-short = <1>;
status = "okay";

fixed-link {
Expand All @@ -88,6 +91,9 @@

ethernet@34000 {
phy-mode = "sgmii";
buffer-manager = <&bm>;
bm,pool-long = <3>;
bm,pool-short = <1>;
status = "okay";

fixed-link {
Expand Down
17 changes: 16 additions & 1 deletion arch/arm/boot/dts/armada-388-db.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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 {
Expand Down Expand Up @@ -99,6 +100,9 @@
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
bm,pool-long = <2>;
bm,pool-short = <3>;
};

usb@58000 {
Expand All @@ -109,6 +113,9 @@
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
bm,pool-long = <0>;
bm,pool-short = <1>;
};

mdio@72004 {
Expand All @@ -129,6 +136,10 @@
status = "okay";
};

bm@c8000 {
status = "okay";
};

flash@d0000 {
status = "okay";
num-cs = <1>;
Expand Down Expand Up @@ -169,6 +180,10 @@
};
};

bm-bppi {
status = "okay";
};

pcie-controller {
status = "okay";
/*
Expand Down
17 changes: 16 additions & 1 deletion arch/arm/boot/dts/armada-388-gp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -133,6 +134,9 @@
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
bm,pool-long = <2>;
bm,pool-short = <3>;
};

/* CON4 */
Expand All @@ -152,6 +156,9 @@
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
bm,pool-long = <0>;
bm,pool-short = <1>;
};


Expand Down Expand Up @@ -186,6 +193,10 @@
};
};

bm@c8000 {
status = "okay";
};

sata@e0000 {
pinctrl-names = "default";
pinctrl-0 = <&sata2_pins>, <&sata3_pins>;
Expand Down Expand Up @@ -240,6 +251,10 @@
};
};

bm-bppi {
status = "okay";
};

pcie-controller {
status = "okay";
/*
Expand Down
15 changes: 14 additions & 1 deletion arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,18 @@
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 {
ethernet@70000 {
pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
phy = <&phy_dedicated>;
phy-mode = "rgmii-id";
buffer-manager = <&bm>;
bm,pool-long = <0>;
bm,pool-short = <1>;
status = "okay";
};

Expand Down Expand Up @@ -110,6 +114,15 @@
pinctrl-names = "default";
status = "okay";
};

bm@c8000 {
status = "okay";
};
};

bm-bppi {
status = "okay";
};

};
};

0 comments on commit c49e99c

Please sign in to comment.