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

ARM: dts: marvell: dove: 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.

  dove-cubox.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 afa6b4f3

arch/arm/boot/dts/marvell/dove-cm-a510.dtsi

+6 −12
Original line number Diff line number Diff line
@@ -108,12 +108,7 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		wifi_power: regulator@1 {

	wifi_power: regulator-1 {

		compatible = "regulator-fixed";

		regulator-name = "WiFi Power";

		regulator-min-microvolt = <3300000>;
@@ -121,7 +116,6 @@ 
		gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;

	};

};

};



/* Optional RTL8211D GbE PHY on SMI address 0x03 */

&mdio {

arch/arm/boot/dts/marvell/dove-cubox.dts

+11 −18
Original line number Diff line number Diff line
@@ -28,14 +28,8 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		usb_power: regulator@1 {

	usb_power: regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "USB Power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -46,7 +40,6 @@ 
		pinctrl-0 = <&pmx_gpio_1>;

		pinctrl-names = "default";

	};

	};



	clocks {

		/* 25MHz reference crystal */

arch/arm/boot/dts/marvell/dove-d3plug.dts

+11 −18
Original line number Diff line number Diff line
@@ -37,14 +37,8 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		usb_power: regulator@1 {

	usb_power: regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "USB Power";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -56,7 +50,6 @@ 
		pinctrl-names = "default";

	};

};

};



&uart0 { status = "okay"; };

&sata0 { status = "okay"; };

arch/arm/boot/dts/marvell/dove-sbc-a510.dts

+14 −16
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ 
		stdout-path = &uart0;

	};



	regulators {

		usb0_power: regulator@2 {

	usb0_power: regulator-2 {

		compatible = "regulator-fixed";

		regulator-name = "USB Power";

		regulator-min-microvolt = <5000000>;
@@ -85,7 +84,7 @@ 
		gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;

	};



		mmc_power: regulator@3 {

	mmc_power: regulator-3 {

		compatible = "regulator-fixed";

		regulator-name = "MMC Power";

		regulator-min-microvolt = <3300000>;
@@ -93,7 +92,6 @@ 
		gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;

	};

};

};



/* Ethernet0 depends on CM-A510 option E1 */

&mdio { status = "disabled"; };