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

ARM: dts: imx28: 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 dc7b1fb4

arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts

+13 −21
Original line number Diff line number Diff line
@@ -10,14 +10,8 @@ / { 
	model = "Armadeus Systems APF28Dev docking/development board";

	compatible = "armadeus,imx28-apf28dev", "armadeus,imx28-apf28", "fsl,imx28";



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb0_vbus: regulator@0 {

	reg_usb0_vbus: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "usb0_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -25,14 +19,12 @@ reg_usb0_vbus: regulator@0 { 
		enable-active-high;

	};



		reg_can0_vcc: regulator@1 {

	reg_can0_vcc: regulator-1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "can0_vcc";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};

	};



	leds {

		compatible = "gpio-leds";

arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts

+8 −15
Original line number Diff line number Diff line
@@ -64,14 +64,8 @@ mac0: ethernet@800f0000 { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb1_vbus: regulator@0 {

	reg_usb1_vbus: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_pins_cfa10037>;

		regulator-name = "usb1_vbus";
@@ -80,4 +74,3 @@ reg_usb1_vbus: regulator@0 { 
		gpio = <&gpio0 7 1>;

	};

};
 
};

arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts

+8 −15
Original line number Diff line number Diff line
@@ -78,14 +78,8 @@ pca9555: pca9555@20 { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb1_vbus: regulator@0 {

	reg_usb1_vbus: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_pins_cfa10049>;

		regulator-name = "usb1_vbus";
@@ -93,7 +87,6 @@ reg_usb1_vbus: regulator@0 { 
		regulator-max-microvolt = <5000000>;

		gpio = <&gpio0 7 1>;

	};

	};



	spi-2 {

		compatible = "spi-gpio";

arch/arm/boot/dts/nxp/mxs/imx28-cfa10057.dts

+8 −15
Original line number Diff line number Diff line
@@ -14,14 +14,8 @@ / { 
	model = "Crystalfontz CFA-10057 Board";

	compatible = "crystalfontz,cfa10057", "crystalfontz,cfa10036", "fsl,imx28";



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb1_vbus: regulator@0 {

	reg_usb1_vbus: regulator-0 {

		compatible = "regulator-fixed";

			reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&usb_pins_cfa10057>;

		regulator-name = "usb1_vbus";
@@ -29,7 +23,6 @@ reg_usb1_vbus: regulator@0 { 
		regulator-max-microvolt = <5000000>;

		gpio = <&gpio0 7 1>;

	};

	};



	backlight {

		compatible = "pwm-backlight";

arch/arm/boot/dts/nxp/mxs/imx28-cfa10058.dts

+8 −15
Original line number Diff line number Diff line
@@ -14,22 +14,15 @@ / { 
	model = "Crystalfontz CFA-10058 Board";

	compatible = "crystalfontz,cfa10058", "crystalfontz,cfa10036", "fsl,imx28";



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb1_vbus: regulator@0 {

	reg_usb1_vbus: regulator-0 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&usb_pins_cfa10058>;

			compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "usb1_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio0 7 1>;

	};

	};



	backlight {

		compatible = "pwm-backlight";