Skip to content

Commit 0f78d6d

Browse files
krzkgclement
authored andcommitted
arm64: dts: marvell: cn9130-db: drop wrong unit-addresses
Top-level nodes, not being on MMIO bus, do not have "reg" properties and should not have unit addresses. Correct their name as well to match "Generic node names" recommendation from Devicetree specification. This also fixes dtc W=1 warnings: cn9130-db.dtsi:28.11-31.4: Warning (unique_unit_address_if_enabled): /memory@0: duplicate unit-address (also used in node /ap0_sd_vccq@0) cn9130-db.dtsi:28.11-31.4: Warning (unique_unit_address_if_enabled): /memory@0: duplicate unit-address (also used in node /cp0_usb3_vbus@0) cn9130-db.dtsi:33.33-40.4: Warning (unique_unit_address_if_enabled): /ap0_sd_vccq@0: duplicate unit-address (also used in node /cp0_usb3_vbus@0) cn9130-db.dtsi:28.11-31.4: Warning (unique_unit_address_if_enabled): /memory@0: duplicate unit-address (also used in node /cp0_usb3_phy@0) cn9130-db.dtsi:33.33-40.4: Warning (unit_address_vs_reg): /ap0_sd_vccq@0: node has a unit name, but no reg or ranges property cn9130-db.dtsi:42.38-49.4: Warning (unit_address_vs_reg): /cp0_usb3_vbus@0: node has a unit name, but no reg or ranges property cn9130-db.dtsi:51.34-54.4: Warning (unit_address_vs_reg): /cp0_usb3_phy@0: node has a unit name, but no reg or ranges property cn9130-db.dtsi:56.38-63.4: Warning (unit_address_vs_reg): /cp0_usb3_vbus@1: node has a unit name, but no reg or ranges property Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent 5d83c23 commit 0f78d6d

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

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

Lines changed: 8 additions & 8 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>;

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

Lines changed: 3 additions & 3 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>;

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)