arch: arm: dts: Remove disabled marvell,dsa properties

These have been disable since the change to probe Marvell Ethernet
switches as MDIO devices. Remove the properties now that the code to
suppport them will also be removed soon.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 2bfb3108b5b268aa27483a3e18b0a657c7c5f96a..c910d157a6860fa0caeaf67c8d41f1302abaa75c 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -114,48 +114,6 @@
                        };
                };
        };
-
-       dsa {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               dsa,ethernet = <&eth1>;
-               dsa,mii-bus = <&mdio>;
-
-               switch@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x10 0>; /* MDIO address 16, switch 0 in tree */
-
-                       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";
-                       };
-               };
-        };
 };
 
 &pciec {

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 89a354b43978fab38a9535c3ee958035c5ba9e3f..20f8d4667753c18ff06733e002d196240c99662c 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -30,64 +30,6 @@
                };
        };
 
-       dsa@0 {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               dsa,ethernet = <&eth1>;
-               dsa,mii-bus = <&mdio>;
-               pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;
-               pinctrl-names = "default";
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               switch@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <4 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";
-                       };
-
-                       port@6 {
-                               /* 88E1512 external phy */
-                               reg = <6>;
-                               label = "lan6";
-                               fixed-link {
-                                       speed = <1000>;
-                                       full-duplex;
-                               };
-                       };
-               };
-       };
-
        gpio-keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&rear_button_pins>;

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 7a2606c3b62e94119946955875ff87dbc798530d..8480a16919a0ed9c8123de9615c04573bac7c928 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -210,53 +210,6 @@
                compatible = "pwm-fan";
                pwms = <&gpio0 24 4000>;
        };
-
-       dsa {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               dsa,ethernet = <&eth0>;
-               dsa,mii-bus = <&mdio>;
-
-               switch@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x0 0>;  /* MDIO address 0, switch 0 in tree */
-
-                       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";
-                       };
-               };
-       };
 };
 
 &pciec {

diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index 31ceacd841deea4238b6ad6a80d23926c210755a..b3ad3f607d313376dc74dbc3b8c50934cb8ed627 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/kirkwood-dir665.dts
@@ -190,53 +190,6 @@
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
        };
-
-       dsa {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               dsa,ethernet = <&eth0port>;
-               dsa,mii-bus = <&mdio>;
-
-               switch@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0>;    /* MDIO address 0, switch 0 in tree */
-
-                       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";
-                       };
-               };
-       };
 };
 
 &mdio {

diff --git a/arch/arm/boot/dts/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
index a7d659b7145aec7a0bd3621930ae7a9b2fb178e6..2f9660f3b457d93e445fd74fe803b47a8b12dcfc 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
@@ -66,53 +66,6 @@
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                };
        };
-
-       dsa {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               dsa,ethernet = <&eth0port>;
-               dsa,mii-bus = <&mdio>;
-
-               switch@16,0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <16 0>;   /* MDIO address 16, switch 0 in tree */
-
-                       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";
-                       };
-               };
-       };
 };
 
 &pinctrl {

diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 86d532916d5653c92fa5cfec301c28f1092011eb..2e1a7534890807d950d7b60ad75688a8eb10f728 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -107,53 +107,6 @@
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
        };
-
-       dsa {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               dsa,ethernet = <&eth0port>;
-               dsa,mii-bus = <&mdio>;
-
-               switch@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0>;    /* MDIO address 0, switch 0 in tree */
-
-                       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";
-                       };
-               };
-       };
 };
 
 &mdio {

diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index 0f22f0e6f56b3f70c9f188593f18d663e70dc2f1..f1f8eee132e870b1dd0b1f2b52aa882b71d9b536 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -48,47 +48,6 @@
                        cd-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
                        /* No WP GPIO */
                };
-       };
-
-       dsa {
-               status = "disabled";
-
-               compatible = "marvell,dsa";
-               #address-cells = <2>;
-               #size-cells = <0>;
-
-               dsa,ethernet = <&eth0port>;
-               dsa,mii-bus = <&mdio>;
-
-               switch@0 {
-                       #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";
-                       };
-               };
        };
 };