leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mvebu dt for 4.11 (part 2)

Browse Source 
Switch device tree files to the new DSA binding
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWIt8ZyMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71fx4AJ4mibAO0PUJ
 Hbts4+PNC5f8PMYHlQCeIDfqtqLKlfJMVH3YFasSLYmb0lo=
 =PRxv
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu into next/dt

mvebu dt for 4.11 (part 2)

Switch device tree files to the new DSA binding

* tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood-rd88f6281: Utilize new DSA binding
  ARM: dts: kirkwood-mv88f6281gtw-ge: Utilize new DSA binding
  ARM: dts: kirkwood-linksys-viper: Utilize new DSA binding
  ARM: dts: kirkwood-dir665: Utilize new DSA binding
  ARM: dts: armada-xp-linksys-mamba: Utilize new DSA binding
  ARM: dts: armada-388-clearfog: Utilize new DSA binding
  ARM: dts: armada-385-linksys: Utilize new DSA binding
  ARM: dts: armada-370-rd: Utilize new DSA binding

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-01-29 21:02:20 -08:00
commit 3c63c24d81
10 changed files with 419 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arch/arm/boot/dts/armada-370-rd.dts
View File

@ -173,6 +173,8 @@
};
dsa {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -235,6 +237,48 @@
phy0: ethernet-phy@0 {
reg = <0>;
};
switch: switch@10 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x10>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan0";
};
port@1 {
reg = <1>;
label = "lan1";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan3";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth1>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};

52
arch/arm/boot/dts/armada-385-linksys.dtsi
View File

@ -103,8 +103,56 @@
};
};
mdio {
mdio@72004 {
status = "okay";
switch@0 {
compatible = "marvell,mv88e6095";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
reg = <4>;
label = "wan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth2>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
sata@a8000 {
@ -261,6 +309,8 @@
};
dsa@0 {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;

65
arch/arm/boot/dts/armada-388-clearfog.dts
View File

@ -72,6 +72,8 @@
};
dsa@0 {
status = "disabled";
compatible = "marvell,dsa";
dsa,ethernet = <&eth1>;
dsa,mii-bus = <&mdio>;
@ -203,6 +205,69 @@
};
};
&mdio {
status = "okay";
switch@4 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <4>;
pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;
pinctrl-names = "default";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan5";
};
port@1 {
reg = <1>;
label = "lan4";
};
port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
reg = <3>;
label = "lan2";
};
port@4 {
reg = <4>;
label = "lan1";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth1>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
port@6 {
/* 88E1512 external phy */
reg = <6>;
label = "lan6";
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
&spi1 {
/*
* Add SPI CS pins for clearfog:

53
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
View File

@ -302,6 +302,8 @@
};
dsa {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -398,3 +400,54 @@
spi-max-frequency = <40000000>;
};
};
&mdio {
status = "okay";
switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
reg = <4>;
label = "internet";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth0>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};

49
arch/arm/boot/dts/kirkwood-dir665.dts
View File

@ -194,6 +194,8 @@
};
dsa {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -241,6 +243,53 @@
&mdio {
status = "okay";
switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
reg = <4>;
label = "wan";
};
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&eth0port>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
/* eth0 is connected to a Marvell 88E6171 switch, without a PHY. So set

49
arch/arm/boot/dts/kirkwood-linksys-viper.dts
View File

@ -70,6 +70,8 @@
};
dsa {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -207,6 +209,53 @@
&mdio {
status = "okay";
switch@10 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <16>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "ethernet1";
};
port@1 {
reg = <1>;
label = "ethernet2";
};
port@2 {
reg = <2>;
label = "ethernet3";
};
port@3 {
reg = <3>;
label = "ethernet4";
};
port@4 {
reg = <4>;
label = "internet";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth0port>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
&uart0 {

49
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View File

@ -112,6 +112,8 @@
};
dsa {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <1>;
#size-cells = <0>;
@ -159,6 +161,53 @@
&mdio {
status = "okay";
switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan1";
};
port@1 {
reg = <1>;
label = "lan2";
};
port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
reg = <3>;
label = "lan4";
};
port@4 {
reg = <4>;
label = "wan";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth0port>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
&eth0 {

9
arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
View File

@ -19,11 +19,6 @@
model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";
compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
dsa {
switch@0 {
reg = <10 0>; /* MDIO address 10, switch 0 in tree */
};
};
};
&mdio {
@ -34,6 +29,10 @@
};
};
&switch {
reg = <10>;
};
&eth1 {
status = "okay";

11
arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
View File

@ -33,3 +33,14 @@
&eth1 {
status = "disabled";
};
&switch {
reg = <0>;
ports {
port@4 {
reg = <4>;
label = "wan";
};
};
};

44
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
View File

@ -54,6 +54,8 @@
};
dsa {
status = "disabled";
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -115,6 +117,48 @@
&mdio {
status = "okay";
switch: switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
label = "lan1";
};
port@1 {
reg = <1>;
label = "lan2";
};
port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
reg = <3>;
label = "lan4";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth0port>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
};
};
&eth0 {