Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f41525b authored by Stefan Agner's avatar Stefan Agner Committed by Shawn Guo
Browse files

ARM: dts: vf-colibri: remove regulator container node 



Drop the fake simple-bus container 'regulators' and put the
regulators directly under the root node. This also makes the
artificial 'reg' properties superfluous. While at it, remove
the unnecessary regulator-always-on property and name the
regulators according to schematics.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 5c35b778

arch/arm/boot/dts/vf-colibri-eval-v3.dtsi

+16 −26
Original line number Diff line number Diff line
@@ -50,32 +50,22 @@ 
		clock-frequency = <16000000>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		sys_5v0_reg: regulator@0 {

	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "5v0";

		regulator-name = "5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

			regulator-always-on;

	};



		/* USBH_PEN */

		usbh_vbus_reg: regulator@1 {

	reg_usbh_vbus: regulator-usbh-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbh1_reg>;

			reg = <1>;

			regulator-name = "usbh_vbus";

		regulator-name = "VCC_USB[1-4]";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

			gpio = <&gpio2 19 GPIO_ACTIVE_LOW>;

			vin-supply = <&sys_5v0_reg>;

		};

		gpio = <&gpio2 19 GPIO_ACTIVE_LOW>; /* USBH_PEN resp. USBH_P_EN */

		vin-supply = <&reg_5v0>;

	};

};
@@ -145,7 +135,7 @@ 
};



&usbh1 {

	vbus-supply = <&usbh_vbus_reg>;

	vbus-supply = <&reg_usbh_vbus>;

};



&iomuxc {