Commit dc7b1fb4 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Shawn Guo
Browse files

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

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent c65fee6c

arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts

+6 −13
Original line number Diff line number Diff line
@@ -54,21 +54,14 @@ user { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_max5821: regulator@0 {

	reg_max5821: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "max5821-reg";

		regulator-min-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

		regulator-always-on;

	};

};

};



&cspi1 {

	cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts

+9 −16
Original line number Diff line number Diff line
@@ -54,16 +54,10 @@ led2 { 
		};

	};



	regulators {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "simple-bus";



		reg_lcd: regulator@0 {

	reg_lcd: regulator-0 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_lcdreg>;

			compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "LCD";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -71,7 +65,6 @@ reg_lcd: regulator@0 { 
		enable-active-high;

	};

};

};



&cspi1 {

	pinctrl-0 = <&pinctrl_cspi1>;

arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts

+6 −13
Original line number Diff line number Diff line
@@ -33,21 +33,14 @@ timing0: 640x480 { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_3v3: regulator@0 {

	reg_3v3: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};

};

};



&fb {

	display = <&display>;

arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts

+9 −12
Original line number Diff line number Diff line
@@ -37,19 +37,16 @@ timing0: 240x320 { 
		};

	};



	regulators {

		regulator@2 {

	regulator-2 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_csien>;

			reg = <2>;

		regulator-name = "CSI_EN";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;

		regulator-always-on;

	};

	};



	usbphy {

		usbphy2: usbphy@2 {

arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi

+11 −19
Original line number Diff line number Diff line
@@ -15,27 +15,19 @@ memory@a0000000 { 
		reg = <0xa0000000 0x08000000>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_3v3: regulator@0 {

	reg_3v3: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



		reg_5v0: regulator@1 {

	reg_5v0: regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "5V0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};

	};



	usbphy {

		compatible = "simple-bus";