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

ARM: dts: imx25: 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 62bb689d

arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts

+9 −16
Original line number Diff line number Diff line
@@ -30,14 +30,8 @@ qvga_timings: 320x240 { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_lcd_3v3: regulator@0 {

	reg_lcd_3v3: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_reg_lcd_3v3>;

		regulator-name = "lcd-3v3";
@@ -47,7 +41,6 @@ reg_lcd_3v3: regulator@0 { 
		enable-active-high;

	};

};

};



&iomuxc {

	imx25-eukrea-mbimxsd25-baseboard-cmo-qvga {

arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts

+7 −14
Original line number Diff line number Diff line
@@ -14,21 +14,14 @@ chosen { 
		stdout-path = &uart1;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_fec_phy: regulator@0 {

	reg_fec_phy: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "fec-phy";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio4 9 0>;

		enable-active-high;

	};

	};



	memory@80000000 {

		device_type = "memory";

arch/arm/boot/dts/nxp/imx/imx25-pdk.dts

+26 −36
Original line number Diff line number Diff line
@@ -16,14 +16,8 @@ memory@80000000 { 
		reg = <0x80000000 0x4000000>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_fec_3v3: regulator@0 {

	reg_fec_3v3: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "fec-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -31,31 +25,27 @@ reg_fec_3v3: regulator@0 { 
		enable-active-high;

	};



		reg_2p5v: regulator@1 {

	reg_2p5v: regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "2P5V";

		regulator-min-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

	};



		reg_3p3v: regulator@2 {

	reg_3p3v: regulator-2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "3P3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



		reg_can_3v3: regulator@3 {

	reg_can_3v3: regulator-3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "can-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio4 6 0>;

	};

	};



	sound {

		compatible = "fsl,imx25-pdk-sgtl5000",