ARM: dts: marvell: armada: drop incorrect reg in fixed regulators

Fixed regulators are not in some bus and bindings do not allow a "reg"
property.  Move them out of "regulators" node to top-level.

  armada-370-dlink-dns327l.dtb: regulator@1: Unevaluated properties are not allowed ('reg' was unexpected)

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
index 561195b749ebe0ed806d4e087aefe658a7d1ad0e..d4c4efabd254393cc0367dcab8b582b0fce2413c 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
@@ -105,54 +105,45 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               usb_power: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       pinctrl-0 = <&xhci_pwr_pin>;
-                       pinctrl-names = "default";
-                       regulator-name = "USB3.0 Port Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-boot-on;
-                       regulator-always-on;
-                       gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-               };
+       usb_power: regulator-1 {
+               compatible = "regulator-fixed";
+               pinctrl-0 = <&xhci_pwr_pin>;
+               pinctrl-names = "default";
+               regulator-name = "USB3.0 Port Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-boot-on;
+               regulator-always-on;
+               gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+       };
 
-               sata_r_power: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       pinctrl-0 = <&sata_r_pwr_pin>;
-                       pinctrl-names = "default";
-                       regulator-name = "SATA-R Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <2000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-               };
+       sata_r_power: regulator-2 {
+               compatible = "regulator-fixed";
+               pinctrl-0 = <&sata_r_pwr_pin>;
+               pinctrl-names = "default";
+               regulator-name = "SATA-R Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <2000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+       };
 
-               sata_l_power: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       pinctrl-0 = <&sata_l_pwr_pin>;
-                       pinctrl-names = "default";
-                       regulator-name = "SATA-L Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <4000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
-               };
+       sata_l_power: regulator-3 {
+               compatible = "regulator-fixed";
+               pinctrl-0 = <&sata_l_pwr_pin>;
+               pinctrl-names = "default";
+               regulator-name = "SATA-L Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <4000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
        };
 };
 

diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
index 9cb69999b1dbcf83d5847a7251e6863227a032a2..370ca9c432479f40cb16f2e6e178a51c428c2940 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
@@ -46,29 +46,26 @@
                };
        };
 
-       regulators {
-               regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "SATA2 power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
-               };
-               regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "SATA3 power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
-               };
+       regulator-3 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA2 power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
+       };
+
+       regulator-4 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA3 power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
        };
 
        gpio-leds {

diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
index 822f10734946d7863d96818acd687fdc1921939b..ffb3179033e72d79a1398f7d5d7930e2ae3e76aa 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
@@ -70,34 +70,26 @@
 
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-names = "default";
-
-               regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "SATA0 power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-               };
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "SATA1 power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-               };
+       regulator-1 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA0 power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
+       };
+
+       regulator-2 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA1 power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
        };
 
        gpio-fan {

diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
index 5ee572dc92423f49b197f31b43a0fc3b283e69b0..45d8ec5dfeb7f31061d6f30b9c67cdf1122d25bc 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
@@ -32,17 +32,14 @@
                };
        };
 
-       regulators {
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "SATA1 power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-               };
+       regulator-2 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA1 power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
        };
 };

diff --git a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
index 124a8ba279e37cf0ffce9b99b81866ab063a81c9..0541248572351f5577db4665d36ade8dfdefe1ca 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
@@ -53,32 +53,25 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "USB Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
-               };
-               regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "SATA0 power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-               };
+       regulator-0 {
+               compatible = "regulator-fixed";
+               regulator-name = "USB Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
+       };
+
+       regulator-1 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA0 power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
        };
 
        gpio-keys {

diff --git a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
index f0893cc06607148978e790f9eb29f5d49eb36eff..b07d11d1f124957ab0b6b843a9e76809d15ceee6 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
@@ -142,38 +142,32 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>;
+       sata1_regulator: sata1-regulator-1 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA1 Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <2000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&sata1_pwr_pin>;
                pinctrl-names = "default";
+       };
 
-               sata1_regulator: sata1-regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "SATA1 Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <2000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
-               };
-
-               sata2_regulator: sata2-regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "SATA2 Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <4000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
-               };
+       sata2_regulator: sata2-regulator-2 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA2 Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <4000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&sata2_pwr_pin>;
+               pinctrl-names = "default";
        };
 };
 

diff --git a/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
index 5551bac1962c2de2e0a866250541fdae893eb092..1b65059794bfe0375c13e059cfe1cd1bc70248dd 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
@@ -109,65 +109,60 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin
-                            &sata3_pwr_pin &sata4_pwr_pin>;
+       sata1_regulator: sata1-regulator-1 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA1 Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <2000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&sata1_pwr_pin>;
                pinctrl-names = "default";
+       };
 
-               sata1_regulator: sata1-regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "SATA1 Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <2000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-               };
-
-               sata2_regulator: sata2-regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "SATA2 Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <4000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
-               };
+       sata2_regulator: sata2-regulator-2 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA2 Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <4000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&sata2_pwr_pin>;
+               pinctrl-names = "default";
+       };
 
-               sata3_regulator: sata3-regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "SATA3 Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <6000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-               };
+       sata3_regulator: sata3-regulator-3 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA3 Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <6000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&sata3_pwr_pin>;
+               pinctrl-names = "default";
+       };
 
-               sata4_regulator: sata4-regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "SATA4 Power";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       startup-delay-us = <8000000>;
-                       enable-active-high;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-               };
+       sata4_regulator: sata4-regulator-4 {
+               compatible = "regulator-fixed";
+               regulator-name = "SATA4 Power";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               startup-delay-us = <8000000>;
+               enable-active-high;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+               pinctrl-0 = <&sata4_pwr_pin>;
+               pinctrl-names = "default";
        };
 };