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

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>

authored by

Andrew Lunn and committed by
Gregory CLEMENT
cb92e404 bfeffd15

-329
-42
arch/arm/boot/dts/armada-370-rd.dts
··· 114 114 }; 115 115 }; 116 116 }; 117 - 118 - dsa { 119 - status = "disabled"; 120 - 121 - compatible = "marvell,dsa"; 122 - #address-cells = <2>; 123 - #size-cells = <0>; 124 - 125 - dsa,ethernet = <&eth1>; 126 - dsa,mii-bus = <&mdio>; 127 - 128 - switch@0 { 129 - #address-cells = <1>; 130 - #size-cells = <0>; 131 - reg = <0x10 0>; /* MDIO address 16, switch 0 in tree */ 132 - 133 - port@0 { 134 - reg = <0>; 135 - label = "lan0"; 136 - }; 137 - 138 - port@1 { 139 - reg = <1>; 140 - label = "lan1"; 141 - }; 142 - 143 - port@2 { 144 - reg = <2>; 145 - label = "lan2"; 146 - }; 147 - 148 - port@3 { 149 - reg = <3>; 150 - label = "lan3"; 151 - }; 152 - 153 - port@5 { 154 - reg = <5>; 155 - label = "cpu"; 156 - }; 157 - }; 158 - }; 159 117 }; 160 118 161 119 &pciec {
-58
arch/arm/boot/dts/armada-388-clearfog.dts
··· 30 30 }; 31 31 }; 32 32 33 - dsa@0 { 34 - status = "disabled"; 35 - 36 - compatible = "marvell,dsa"; 37 - dsa,ethernet = <&eth1>; 38 - dsa,mii-bus = <&mdio>; 39 - pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>; 40 - pinctrl-names = "default"; 41 - #address-cells = <2>; 42 - #size-cells = <0>; 43 - 44 - switch@0 { 45 - #address-cells = <1>; 46 - #size-cells = <0>; 47 - reg = <4 0>; 48 - 49 - port@0 { 50 - reg = <0>; 51 - label = "lan5"; 52 - }; 53 - 54 - port@1 { 55 - reg = <1>; 56 - label = "lan4"; 57 - }; 58 - 59 - port@2 { 60 - reg = <2>; 61 - label = "lan3"; 62 - }; 63 - 64 - port@3 { 65 - reg = <3>; 66 - label = "lan2"; 67 - }; 68 - 69 - port@4 { 70 - reg = <4>; 71 - label = "lan1"; 72 - }; 73 - 74 - port@5 { 75 - reg = <5>; 76 - label = "cpu"; 77 - }; 78 - 79 - port@6 { 80 - /* 88E1512 external phy */ 81 - reg = <6>; 82 - label = "lan6"; 83 - fixed-link { 84 - speed = <1000>; 85 - full-duplex; 86 - }; 87 - }; 88 - }; 89 - }; 90 - 91 33 gpio-keys { 92 34 compatible = "gpio-keys"; 93 35 pinctrl-0 = <&rear_button_pins>;
-47
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
··· 210 210 compatible = "pwm-fan"; 211 211 pwms = <&gpio0 24 4000>; 212 212 }; 213 - 214 - dsa { 215 - status = "disabled"; 216 - 217 - compatible = "marvell,dsa"; 218 - #address-cells = <2>; 219 - #size-cells = <0>; 220 - 221 - dsa,ethernet = <&eth0>; 222 - dsa,mii-bus = <&mdio>; 223 - 224 - switch@0 { 225 - #address-cells = <1>; 226 - #size-cells = <0>; 227 - reg = <0x0 0>; /* MDIO address 0, switch 0 in tree */ 228 - 229 - port@0 { 230 - reg = <0>; 231 - label = "lan4"; 232 - }; 233 - 234 - port@1 { 235 - reg = <1>; 236 - label = "lan3"; 237 - }; 238 - 239 - port@2 { 240 - reg = <2>; 241 - label = "lan2"; 242 - }; 243 - 244 - port@3 { 245 - reg = <3>; 246 - label = "lan1"; 247 - }; 248 - 249 - port@4 { 250 - reg = <4>; 251 - label = "internet"; 252 - }; 253 - 254 - port@5 { 255 - reg = <5>; 256 - label = "cpu"; 257 - }; 258 - }; 259 - }; 260 213 }; 261 214 262 215 &pciec {
-47
arch/arm/boot/dts/kirkwood-dir665.dts
··· 190 190 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 191 191 }; 192 192 }; 193 - 194 - dsa { 195 - status = "disabled"; 196 - 197 - compatible = "marvell,dsa"; 198 - #address-cells = <2>; 199 - #size-cells = <0>; 200 - 201 - dsa,ethernet = <&eth0port>; 202 - dsa,mii-bus = <&mdio>; 203 - 204 - switch@0 { 205 - #address-cells = <1>; 206 - #size-cells = <0>; 207 - reg = <0 0>; /* MDIO address 0, switch 0 in tree */ 208 - 209 - port@0 { 210 - reg = <0>; 211 - label = "lan4"; 212 - }; 213 - 214 - port@1 { 215 - reg = <1>; 216 - label = "lan3"; 217 - }; 218 - 219 - port@2 { 220 - reg = <2>; 221 - label = "lan2"; 222 - }; 223 - 224 - port@3 { 225 - reg = <3>; 226 - label = "lan1"; 227 - }; 228 - 229 - port@4 { 230 - reg = <4>; 231 - label = "wan"; 232 - }; 233 - 234 - port@6 { 235 - reg = <6>; 236 - label = "cpu"; 237 - }; 238 - }; 239 - }; 240 193 }; 241 194 242 195 &mdio {
-47
arch/arm/boot/dts/kirkwood-linksys-viper.dts
··· 66 66 gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; 67 67 }; 68 68 }; 69 - 70 - dsa { 71 - status = "disabled"; 72 - 73 - compatible = "marvell,dsa"; 74 - #address-cells = <2>; 75 - #size-cells = <0>; 76 - 77 - dsa,ethernet = <&eth0port>; 78 - dsa,mii-bus = <&mdio>; 79 - 80 - switch@16,0 { 81 - #address-cells = <1>; 82 - #size-cells = <0>; 83 - reg = <16 0>; /* MDIO address 16, switch 0 in tree */ 84 - 85 - port@0 { 86 - reg = <0>; 87 - label = "ethernet1"; 88 - }; 89 - 90 - port@1 { 91 - reg = <1>; 92 - label = "ethernet2"; 93 - }; 94 - 95 - port@2 { 96 - reg = <2>; 97 - label = "ethernet3"; 98 - }; 99 - 100 - port@3 { 101 - reg = <3>; 102 - label = "ethernet4"; 103 - }; 104 - 105 - port@4 { 106 - reg = <4>; 107 - label = "internet"; 108 - }; 109 - 110 - port@5 { 111 - reg = <5>; 112 - label = "cpu"; 113 - }; 114 - }; 115 - }; 116 69 }; 117 70 118 71 &pinctrl {
-47
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
··· 107 107 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 108 108 }; 109 109 }; 110 - 111 - dsa { 112 - status = "disabled"; 113 - 114 - compatible = "marvell,dsa"; 115 - #address-cells = <1>; 116 - #size-cells = <0>; 117 - 118 - dsa,ethernet = <&eth0port>; 119 - dsa,mii-bus = <&mdio>; 120 - 121 - switch@0 { 122 - #address-cells = <1>; 123 - #size-cells = <0>; 124 - reg = <0 0>; /* MDIO address 0, switch 0 in tree */ 125 - 126 - port@0 { 127 - reg = <0>; 128 - label = "lan1"; 129 - }; 130 - 131 - port@1 { 132 - reg = <1>; 133 - label = "lan2"; 134 - }; 135 - 136 - port@2 { 137 - reg = <2>; 138 - label = "lan3"; 139 - }; 140 - 141 - port@3 { 142 - reg = <3>; 143 - label = "lan4"; 144 - }; 145 - 146 - port@4 { 147 - reg = <4>; 148 - label = "wan"; 149 - }; 150 - 151 - port@5 { 152 - reg = <5>; 153 - label = "cpu"; 154 - }; 155 - }; 156 - }; 157 110 }; 158 111 159 112 &mdio {
-41
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
··· 48 48 cd-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; 49 49 /* No WP GPIO */ 50 50 }; 51 - }; 52 - 53 - dsa { 54 - status = "disabled"; 55 - 56 - compatible = "marvell,dsa"; 57 - #address-cells = <2>; 58 - #size-cells = <0>; 59 - 60 - dsa,ethernet = <&eth0port>; 61 - dsa,mii-bus = <&mdio>; 62 - 63 - switch@0 { 64 - #address-cells = <1>; 65 - #size-cells = <0>; 66 - 67 - port@0 { 68 - reg = <0>; 69 - label = "lan1"; 70 - }; 71 - 72 - port@1 { 73 - reg = <1>; 74 - label = "lan2"; 75 - }; 76 - 77 - port@2 { 78 - reg = <2>; 79 - label = "lan3"; 80 - }; 81 - 82 - port@3 { 83 - reg = <3>; 84 - label = "lan4"; 85 - }; 86 - 87 - port@5 { 88 - reg = <5>; 89 - label = "cpu"; 90 - }; 91 - }; 92 51 }; 93 52 }; 94 53