Commit afa6b4f3 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Gregory CLEMENT
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent c44fdf86

arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts

+37 −46
Original line number Diff line number Diff line
@@ -105,14 +105,8 @@ led-backup { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		usb_power: regulator@1 {

	usb_power: regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		pinctrl-0 = <&xhci_pwr_pin>;

		pinctrl-names = "default";

		regulator-name = "USB3.0 Port Power";
@@ -124,9 +118,8 @@ usb_power: regulator@1 { 
		gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;

	};



		sata_r_power: regulator@2 {

	sata_r_power: regulator-2 {

		compatible = "regulator-fixed";

			reg = <2>;

		pinctrl-0 = <&sata_r_pwr_pin>;

		pinctrl-names = "default";

		regulator-name = "SATA-R Power";
@@ -139,9 +132,8 @@ sata_r_power: regulator@2 { 
		gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;

	};



		sata_l_power: regulator@3 {

	sata_l_power: regulator-3 {

		compatible = "regulator-fixed";

			reg = <3>;

		pinctrl-0 = <&sata_l_pwr_pin>;

		pinctrl-names = "default";

		regulator-name = "SATA-L Power";
@@ -154,7 +146,6 @@ sata_l_power: regulator@3 { 
		gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;

	};

};

};



&pciec {

	status = "okay";

arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts

+20 −23
Original line number Diff line number Diff line
@@ -46,10 +46,8 @@ pca9554: pca9554@21 { 
		};

	};



	regulators {

		regulator@3 {

	regulator-3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "SATA2 power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -58,9 +56,9 @@ regulator@3 { 
		regulator-boot-on;

		gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;

	};

		regulator@4 {



	regulator-4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "SATA3 power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -69,7 +67,6 @@ regulator@4 { 
		regulator-boot-on;

		gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;

	};

	};



	gpio-leds {

		led-red-sata2 {

arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi

+20 −28
Original line number Diff line number Diff line
@@ -70,15 +70,8 @@ rtc@6f { 


	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		pinctrl-names = "default";



		regulator@1 {

	regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "SATA0 power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -87,9 +80,9 @@ regulator@1 { 
		regulator-boot-on;

		gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;

	};

		regulator@2 {



	regulator-2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "SATA1 power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -98,7 +91,6 @@ regulator@2 { 
		regulator-boot-on;

		gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;

	};

	};



	gpio-fan {

		compatible = "gpio-fan";

arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts

+9 −12
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ sata@a0000 { 
		};

	};



	regulators {

		regulator@2 {

	regulator-2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "SATA1 power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -45,4 +43,3 @@ regulator@2 { 
		gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;

	};

};
 
};

arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi

+19 −26
Original line number Diff line number Diff line
@@ -53,14 +53,8 @@ usb@50000 { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		regulator@0 {

	regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "USB Power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -68,9 +62,9 @@ regulator@0 { 
		regulator-boot-on;

		gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;

	};

		regulator@1 {



	regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "SATA0 power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -79,7 +73,6 @@ regulator@1 { 
		regulator-boot-on;

		gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;

	};

	};



	gpio-keys {

		compatible = "gpio-keys";