| Message ID | 20190206180526.32423-1-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | cb92e40411ef8a773675b522d29b6ea82e5fb8e0 |
| Headers | show |
| Series | arch: arm: dts: Remove disabled marvell,dsa properties | expand |
Hi Andrew, On mer., févr. 06 2019, Andrew Lunn <andrew@lunn.ch> wrote: > 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> Applied on mvebu/dt. Thanks, Gregory > --- > arch/arm/boot/dts/armada-370-rd.dts | 42 -------------- > arch/arm/boot/dts/armada-388-clearfog.dts | 58 ------------------- > arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 47 --------------- > arch/arm/boot/dts/kirkwood-dir665.dts | 47 --------------- > arch/arm/boot/dts/kirkwood-linksys-viper.dts | 47 --------------- > .../arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 47 --------------- > arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 41 ------------- > 7 files changed, 329 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts > index 2bfb3108b5b2..c910d157a686 100644 > --- 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 = <ð1>; > - 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 89a354b43978..20f8d4667753 100644 > --- 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 = <ð1>; > - 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 7a2606c3b62e..8480a16919a0 100644 > --- 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 = <ð0>; > - 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 31ceacd841de..b3ad3f607d31 100644 > --- 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 = <ð0port>; > - 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 a7d659b7145a..2f9660f3b457 100644 > --- 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 = <ð0port>; > - 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 86d532916d56..2e1a75348908 100644 > --- 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 = <ð0port>; > - 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 0f22f0e6f56b..f1f8eee132e8 100644 > --- 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 = <ð0port>; > - 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"; > - }; > - }; > }; > }; > > -- > 2.20.1 >
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index 2bfb3108b5b2..c910d157a686 100644 --- 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 = <ð1>; - 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 89a354b43978..20f8d4667753 100644 --- 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 = <ð1>; - 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 7a2606c3b62e..8480a16919a0 100644 --- 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 = <ð0>; - 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 31ceacd841de..b3ad3f607d31 100644 --- 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 = <ð0port>; - 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 a7d659b7145a..2f9660f3b457 100644 --- 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 = <ð0port>; - 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 86d532916d56..2e1a75348908 100644 --- 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 = <ð0port>; - 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 0f22f0e6f56b..f1f8eee132e8 100644 --- 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 = <ð0port>; - 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"; - }; - }; }; };
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> --- arch/arm/boot/dts/armada-370-rd.dts | 42 -------------- arch/arm/boot/dts/armada-388-clearfog.dts | 58 ------------------- arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 47 --------------- arch/arm/boot/dts/kirkwood-dir665.dts | 47 --------------- arch/arm/boot/dts/kirkwood-linksys-viper.dts | 47 --------------- .../arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 47 --------------- arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 41 ------------- 7 files changed, 329 deletions(-)