Skip to content

Commit 8db93c2

Browse files
arndbarndb
committed
Merge tag 'mvebu-dt64-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.10 (part 1) Few dts fix for dt validation * tag 'mvebu-dt64-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells arm64: dts: marvell: eDPU: drop redundant address/size-cells arm64: dts: marvell: cn9130-crb: drop unneeded "status" arm64: dts: marvell: cn9130-crb: drop wrong unit-addresses arm64: dts: marvell: cn9130-db: drop wrong unit-addresses arm64: dts: marvell: cn9131-db: drop unneeded flash address/size-cells arm64: dts: marvell: cn9130-db: drop unneeded flash address/size-cells arm64: dts: marvell: ap80x: fix IOMMU unit address Link: https://lore.kernel.org/r/87jzk8ndyy.fsf@BLaptop.bootlin.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents d10ee71 + 4289937 commit 8db93c2

8 files changed

+88
-67
lines changed

‎arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
/* Actual device is MV88E6361 */
2626
switch: switch@0 {
2727
compatible = "marvell,mv88e6190";
28-
#address-cells = <1>;
29-
#size-cells = <0>;
3028
reg = <0>;
3129
status = "disabled";
3230

‎arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -114,54 +114,84 @@
114114
};
115115

116116
&mdio {
117+
/* Switch is @3, not @1 */
118+
/delete-node/ ethernet-switch@1;
117119
extphy: ethernet-phy@1 {
118120
reg = <1>;
119121

120122
reset-gpios = <&gpionb 2 GPIO_ACTIVE_LOW>;
121123
};
122-
};
123124

124-
&switch0 {
125-
reg = <3>;
125+
switch0: ethernet-switch@3 {
126+
compatible = "marvell,mv88e6085";
127+
reg = <3>;
126128

127-
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
129+
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
130+
dsa,member = <0 0>;
128131

129-
ethernet-ports {
130-
switch0port1: ethernet-port@1 {
131-
reg = <1>;
132-
label = "lan0";
133-
phy-handle = <&switch0phy0>;
134-
};
132+
ethernet-ports {
133+
#address-cells = <1>;
134+
#size-cells = <0>;
135+
136+
switch0port0: ethernet-port@0 {
137+
reg = <0>;
138+
label = "cpu";
139+
ethernet = <&eth0>;
140+
phy-mode = "rgmii-id";
141+
fixed-link {
142+
speed = <1000>;
143+
full-duplex;
144+
};
145+
};
135146

136-
switch0port2: ethernet-port@2 {
137-
reg = <2>;
138-
label = "lan1";
139-
phy-handle = <&switch0phy1>;
140-
};
147+
switch0port1: ethernet-port@1 {
148+
reg = <1>;
149+
label = "lan0";
150+
phy-handle = <&switch0phy0>;
151+
};
141152

142-
switch0port3: ethernet-port@3 {
143-
reg = <3>;
144-
label = "lan2";
145-
phy-handle = <&switch0phy2>;
146-
};
153+
switch0port2: ethernet-port@2 {
154+
reg = <2>;
155+
label = "lan1";
156+
phy-handle = <&switch0phy1>;
157+
};
147158

148-
switch0port4: ethernet-port@4 {
149-
reg = <4>;
150-
label = "lan3";
151-
phy-handle = <&switch0phy3>;
152-
};
159+
switch0port3: ethernet-port@3 {
160+
reg = <3>;
161+
label = "lan2";
162+
phy-handle = <&switch0phy2>;
163+
};
153164

154-
switch0port5: ethernet-port@5 {
155-
reg = <5>;
156-
label = "wan";
157-
phy-handle = <&extphy>;
158-
phy-mode = "sgmii";
165+
switch0port4: ethernet-port@4 {
166+
reg = <4>;
167+
label = "lan3";
168+
phy-handle = <&switch0phy3>;
169+
};
170+
171+
switch0port5: ethernet-port@5 {
172+
reg = <5>;
173+
label = "wan";
174+
phy-handle = <&extphy>;
175+
phy-mode = "sgmii";
176+
};
159177
};
160-
};
161178

162-
mdio {
163-
switch0phy3: ethernet-phy@14 {
164-
reg = <0x14>;
179+
mdio {
180+
#address-cells = <1>;
181+
#size-cells = <0>;
182+
183+
switch0phy0: ethernet-phy@11 {
184+
reg = <0x11>;
185+
};
186+
switch0phy1: ethernet-phy@12 {
187+
reg = <0x12>;
188+
};
189+
switch0phy2: ethernet-phy@13 {
190+
reg = <0x13>;
191+
};
192+
switch0phy3: ethernet-phy@14 {
193+
reg = <0x14>;
194+
};
165195
};
166196
};
167197
};

‎arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@
216216
assigned-clock-rates = <20000000>;
217217

218218
flash@0 {
219-
#address-cells = <1>;
220-
#size-cells = <1>;
221219
compatible = "jedec,spi-nor";
222220
reg = <0>;
223221
spi-max-frequency = <20000000>;

‎arch/arm64/boot/dts/marvell/armada-ap80x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
compatible = "simple-bus";
6262
ranges = <0x0 0x0 0xf0000000 0x1000000>;
6363

64-
smmu: iommu@5000000 {
64+
smmu: iommu@100000 {
6565
compatible = "marvell,ap806-smmu-500", "arm,mmu-500";
6666
reg = <0x100000 0x100000>;
6767
dma-coherent;

‎arch/arm64/boot/dts/marvell/cn9130-crb.dtsi

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
reg = <0x0 0x0 0x0 0x80000000>;
2727
};
2828

29-
ap0_reg_mmc_vccq: ap0_mmc_vccq@0 {
29+
ap0_reg_mmc_vccq: regulator-1 {
3030
compatible = "regulator-gpio";
3131
regulator-name = "ap0_mmc_vccq";
3232
regulator-min-microvolt = <1800000>;
@@ -36,7 +36,7 @@
3636
3300000 0x0>;
3737
};
3838

39-
cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
39+
cp0_reg_usb3_vbus1: regulator-2 {
4040
compatible = "regulator-fixed";
4141
regulator-name = "cp0-xhci1-vbus";
4242
regulator-min-microvolt = <5000000>;
@@ -45,16 +45,16 @@
4545
gpio = <&expander0 8 GPIO_ACTIVE_HIGH>;
4646
};
4747

48-
cp0_usb3_0_phy0: cp0_usb3_phy0 {
48+
cp0_usb3_0_phy0: usb-phy-1 {
4949
compatible = "usb-nop-xceiv";
5050
};
5151

52-
cp0_usb3_0_phy1: cp0_usb3_phy1 {
52+
cp0_usb3_0_phy1: usb-phy-2 {
5353
compatible = "usb-nop-xceiv";
5454
vcc-supply = <&cp0_reg_usb3_vbus1>;
5555
};
5656

57-
cp0_reg_sd_vccq: cp0_sd_vccq@0 {
57+
cp0_reg_sd_vccq: regulator-3 {
5858
compatible = "regulator-gpio";
5959
regulator-name = "cp0_sd_vccq";
6060
regulator-min-microvolt = <1800000>;
@@ -64,7 +64,7 @@
6464
3300000 0x0>;
6565
};
6666

67-
cp0_reg_sd_vcc: cp0_sd_vcc@0 {
67+
cp0_reg_sd_vcc: regulator-4 {
6868
compatible = "regulator-fixed";
6969
regulator-name = "cp0_sd_vcc";
7070
regulator-min-microvolt = <3300000>;
@@ -82,7 +82,6 @@
8282
tx-disable-gpios = <&expander0 2 GPIO_ACTIVE_HIGH>;
8383
tx-fault-gpios = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>;
8484
maximum-power-milliwatt = <3000>;
85-
status = "okay";
8685
};
8786
};
8887

‎arch/arm64/boot/dts/marvell/cn9130-db.dtsi

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
reg = <0x0 0x0 0x0 0x80000000>;
3131
};
3232

33-
ap0_reg_sd_vccq: ap0_sd_vccq@0 {
33+
ap0_reg_sd_vccq: regulator-1 {
3434
compatible = "regulator-gpio";
3535
regulator-name = "ap0_sd_vccq";
3636
regulator-min-microvolt = <1800000>;
@@ -39,7 +39,7 @@
3939
states = <1800000 0x1 3300000 0x0>;
4040
};
4141

42-
cp0_reg_usb3_vbus0: cp0_usb3_vbus@0 {
42+
cp0_reg_usb3_vbus0: regulator-2 {
4343
compatible = "regulator-fixed";
4444
regulator-name = "cp0-xhci0-vbus";
4545
regulator-min-microvolt = <5000000>;
@@ -48,12 +48,12 @@
4848
gpio = <&expander0 0 GPIO_ACTIVE_HIGH>;
4949
};
5050

51-
cp0_usb3_0_phy0: cp0_usb3_phy@0 {
51+
cp0_usb3_0_phy0: usb-phy-1 {
5252
compatible = "usb-nop-xceiv";
5353
vcc-supply = <&cp0_reg_usb3_vbus0>;
5454
};
5555

56-
cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
56+
cp0_reg_usb3_vbus1: regulator-3 {
5757
compatible = "regulator-fixed";
5858
regulator-name = "cp0-xhci1-vbus";
5959
regulator-min-microvolt = <5000000>;
@@ -62,12 +62,12 @@
6262
gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;
6363
};
6464

65-
cp0_usb3_0_phy1: cp0_usb3_phy@1 {
65+
cp0_usb3_0_phy1: usb-phy-2 {
6666
compatible = "usb-nop-xceiv";
6767
vcc-supply = <&cp0_reg_usb3_vbus1>;
6868
};
6969

70-
cp0_reg_sd_vccq: cp0_sd_vccq@0 {
70+
cp0_reg_sd_vccq: regulator-4 {
7171
compatible = "regulator-gpio";
7272
regulator-name = "cp0_sd_vccq";
7373
regulator-min-microvolt = <1800000>;
@@ -77,7 +77,7 @@
7777
3300000 0x0>;
7878
};
7979

80-
cp0_reg_sd_vcc: cp0_sd_vcc@0 {
80+
cp0_reg_sd_vcc: regulator-5 {
8181
compatible = "regulator-fixed";
8282
regulator-name = "cp0_sd_vcc";
8383
regulator-min-microvolt = <3300000>;
@@ -87,7 +87,7 @@
8787
regulator-always-on;
8888
};
8989

90-
cp0_sfp_eth0: sfp-eth@0 {
90+
cp0_sfp_eth0: sfp-eth-1 {
9191
compatible = "sff,sfp";
9292
i2c-bus = <&cp0_sfpp0_i2c>;
9393
los-gpios = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>;
@@ -311,8 +311,6 @@
311311
reg = <0x700680 0x50>;
312312

313313
flash@0 {
314-
#address-cells = <0x1>;
315-
#size-cells = <0x1>;
316314
compatible = "jedec,spi-nor";
317315
reg = <0x0>;
318316
/* On-board MUX does not allow higher frequencies */

‎arch/arm64/boot/dts/marvell/cn9131-db.dtsi

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ethernet4 = &cp1_eth1;
1919
};
2020

21-
cp1_reg_usb3_vbus0: cp1_usb3_vbus@0 {
21+
cp1_reg_usb3_vbus0: regulator-6 {
2222
compatible = "regulator-fixed";
2323
pinctrl-names = "default";
2424
pinctrl-0 = <&cp1_xhci0_vbus_pins>;
@@ -29,12 +29,12 @@
2929
gpio = <&cp1_gpio1 3 GPIO_ACTIVE_HIGH>;
3030
};
3131

32-
cp1_usb3_0_phy0: cp1_usb3_phy0 {
32+
cp1_usb3_0_phy0: usb-phy-3 {
3333
compatible = "usb-nop-xceiv";
3434
vcc-supply = <&cp1_reg_usb3_vbus0>;
3535
};
3636

37-
cp1_sfp_eth1: sfp-eth1 {
37+
cp1_sfp_eth1: sfp-eth-2 {
3838
compatible = "sff,sfp";
3939
i2c-bus = <&cp1_i2c0>;
4040
los-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>;
@@ -138,8 +138,6 @@
138138
reg = <0x700680 0x50>;
139139

140140
flash@0 {
141-
#address-cells = <0x1>;
142-
#size-cells = <0x1>;
143141
compatible = "jedec,spi-nor";
144142
reg = <0x0>;
145143
/* On-board MUX does not allow higher frequencies */

‎arch/arm64/boot/dts/marvell/cn9132-db.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ethernet5 = &cp2_eth0;
1818
};
1919

20-
cp2_reg_usb3_vbus0: cp2_usb3_vbus@0 {
20+
cp2_reg_usb3_vbus0: regulator-7 {
2121
compatible = "regulator-fixed";
2222
regulator-name = "cp2-xhci0-vbus";
2323
regulator-min-microvolt = <5000000>;
@@ -26,12 +26,12 @@
2626
gpio = <&cp2_gpio1 2 GPIO_ACTIVE_HIGH>;
2727
};
2828

29-
cp2_usb3_0_phy0: cp2_usb3_phy0 {
29+
cp2_usb3_0_phy0: usb-phy-4 {
3030
compatible = "usb-nop-xceiv";
3131
vcc-supply = <&cp2_reg_usb3_vbus0>;
3232
};
3333

34-
cp2_reg_usb3_vbus1: cp2_usb3_vbus@1 {
34+
cp2_reg_usb3_vbus1: regulator-8 {
3535
compatible = "regulator-fixed";
3636
regulator-name = "cp2-xhci1-vbus";
3737
regulator-min-microvolt = <5000000>;
@@ -40,12 +40,12 @@
4040
gpio = <&cp2_gpio1 3 GPIO_ACTIVE_HIGH>;
4141
};
4242

43-
cp2_usb3_0_phy1: cp2_usb3_phy1 {
43+
cp2_usb3_0_phy1: usb-phy-5 {
4444
compatible = "usb-nop-xceiv";
4545
vcc-supply = <&cp2_reg_usb3_vbus1>;
4646
};
4747

48-
cp2_reg_sd_vccq: cp2_sd_vccq@0 {
48+
cp2_reg_sd_vccq: regulator-9 {
4949
compatible = "regulator-gpio";
5050
regulator-name = "cp2_sd_vcc";
5151
regulator-min-microvolt = <1800000>;
@@ -54,7 +54,7 @@
5454
states = <1800000 0x1 3300000 0x0>;
5555
};
5656

57-
cp2_sfp_eth0: sfp-eth0 {
57+
cp2_sfp_eth0: sfp-eth-3 {
5858
compatible = "sff,sfp";
5959
i2c-bus = <&cp2_sfpp0_i2c>;
6060
los-gpios = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>;

0 commit comments

Comments
 (0)