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>

diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
index 01d6645ddba7be42b0958368d51a636d1ac6cc0a..be56a233626534bd64e6f75a5a0821044c38caed 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
@@ -30,7 +30,7 @@
                reg = <0x0 0x0 0x0 0x80000000>;
        };
 
-       ap0_reg_sd_vccq: ap0_sd_vccq@0 {
+       ap0_reg_sd_vccq: regulator-1 {
                compatible = "regulator-gpio";
                regulator-name = "ap0_sd_vccq";
                regulator-min-microvolt = <1800000>;
@@ -39,7 +39,7 @@
                states = <1800000 0x1 3300000 0x0>;
        };
 
-       cp0_reg_usb3_vbus0: cp0_usb3_vbus@0 {
+       cp0_reg_usb3_vbus0: regulator-2 {
                compatible = "regulator-fixed";
                regulator-name = "cp0-xhci0-vbus";
                regulator-min-microvolt = <5000000>;
@@ -48,12 +48,12 @@
                gpio = <&expander0 0 GPIO_ACTIVE_HIGH>;
        };
 
-       cp0_usb3_0_phy0: cp0_usb3_phy@0 {
+       cp0_usb3_0_phy0: usb-phy-1 {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&cp0_reg_usb3_vbus0>;
        };
 
-       cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
+       cp0_reg_usb3_vbus1: regulator-3 {
                compatible = "regulator-fixed";
                regulator-name = "cp0-xhci1-vbus";
                regulator-min-microvolt = <5000000>;
@@ -62,12 +62,12 @@
                gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;
        };
 
-       cp0_usb3_0_phy1: cp0_usb3_phy@1 {
+       cp0_usb3_0_phy1: usb-phy-2 {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&cp0_reg_usb3_vbus1>;
        };
 
-       cp0_reg_sd_vccq: cp0_sd_vccq@0 {
+       cp0_reg_sd_vccq: regulator-4 {
                compatible = "regulator-gpio";
                regulator-name = "cp0_sd_vccq";
                regulator-min-microvolt = <1800000>;
@@ -77,7 +77,7 @@
                          3300000 0x0>;
        };
 
-       cp0_reg_sd_vcc: cp0_sd_vcc@0 {
+       cp0_reg_sd_vcc: regulator-5 {
                compatible = "regulator-fixed";
                regulator-name = "cp0_sd_vcc";
                regulator-min-microvolt = <3300000>;
@@ -87,7 +87,7 @@
                regulator-always-on;
        };
 
-       cp0_sfp_eth0: sfp-eth@0 {
+       cp0_sfp_eth0: sfp-eth-1 {
                compatible = "sff,sfp";
                i2c-bus = <&cp0_sfpp0_i2c>;
                los-gpios = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
index 8f2523786cfb92de96e02fe987e40524b4c946a7..ad7360c830486bf30854e5885e0d95c1b4260169 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
@@ -18,7 +18,7 @@
                ethernet4 = &cp1_eth1;
        };
 
-       cp1_reg_usb3_vbus0: cp1_usb3_vbus@0 {
+       cp1_reg_usb3_vbus0: regulator-6 {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
                pinctrl-0 = <&cp1_xhci0_vbus_pins>;
@@ -29,12 +29,12 @@
                gpio = <&cp1_gpio1 3 GPIO_ACTIVE_HIGH>;
        };
 
-       cp1_usb3_0_phy0: cp1_usb3_phy0 {
+       cp1_usb3_0_phy0: usb-phy-3 {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&cp1_reg_usb3_vbus0>;
        };
 
-       cp1_sfp_eth1: sfp-eth1 {
+       cp1_sfp_eth1: sfp-eth-2 {
                compatible = "sff,sfp";
                i2c-bus = <&cp1_i2c0>;
                los-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
index 512a4fa2861e792129997da9dddcd1c3cce9834f..e753cfdac697330512f6c46c2b656dd57768b2c5 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
@@ -17,7 +17,7 @@
                ethernet5 = &cp2_eth0;
        };
 
-       cp2_reg_usb3_vbus0: cp2_usb3_vbus@0 {
+       cp2_reg_usb3_vbus0: regulator-7 {
                compatible = "regulator-fixed";
                regulator-name = "cp2-xhci0-vbus";
                regulator-min-microvolt = <5000000>;
@@ -26,12 +26,12 @@
                gpio = <&cp2_gpio1 2 GPIO_ACTIVE_HIGH>;
        };
 
-       cp2_usb3_0_phy0: cp2_usb3_phy0 {
+       cp2_usb3_0_phy0: usb-phy-4 {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&cp2_reg_usb3_vbus0>;
        };
 
-       cp2_reg_usb3_vbus1: cp2_usb3_vbus@1 {
+       cp2_reg_usb3_vbus1: regulator-8 {
                compatible = "regulator-fixed";
                regulator-name = "cp2-xhci1-vbus";
                regulator-min-microvolt = <5000000>;
@@ -40,12 +40,12 @@
                gpio = <&cp2_gpio1 3 GPIO_ACTIVE_HIGH>;
        };
 
-       cp2_usb3_0_phy1: cp2_usb3_phy1 {
+       cp2_usb3_0_phy1: usb-phy-5 {
                compatible = "usb-nop-xceiv";
                vcc-supply = <&cp2_reg_usb3_vbus1>;
        };
 
-       cp2_reg_sd_vccq: cp2_sd_vccq@0 {
+       cp2_reg_sd_vccq: regulator-9 {
                compatible = "regulator-gpio";
                regulator-name = "cp2_sd_vcc";
                regulator-min-microvolt = <1800000>;
@@ -54,7 +54,7 @@
                states = <1800000 0x1 3300000 0x0>;
        };
 
-       cp2_sfp_eth0: sfp-eth0 {
+       cp2_sfp_eth0: sfp-eth-3 {
                compatible = "sff,sfp";
                i2c-bus = <&cp2_sfpp0_i2c>;
                los-gpios = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>;