summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2016-02-18 02:40:58 +0300
committerShawn Guo <shawnguo@kernel.org>2016-02-29 11:17:34 +0300
commit4f41525b4d225d78228f8bb74bb922994bf65d35 (patch)
treef88e2420dd80ee3c7b63a3097d4497f0eaddbbdd /arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
parent5c35b778bfe72c12506b1be0b0ace66ca2592fd7 (diff)
downloadlinux-4f41525b4d225d78228f8bb74bb922994bf65d35.tar.xz
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: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/vf-colibri-eval-v3.dtsi')
-rw-r--r--arch/arm/boot/dts/vf-colibri-eval-v3.dtsi42
1 files changed, 16 insertions, 26 deletions
diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
index b49467372643..291e9395d6d0 100644
--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
@@ -50,32 +50,22 @@
clock-frequency = <16000000>;
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- sys_5v0_reg: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "5v0";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-always-on;
- };
+ reg_5v0: regulator-5v0 {
+ compatible = "regulator-fixed";
+ regulator-name = "5V";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
- /* USBH_PEN */
- usbh_vbus_reg: regulator@1 {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usbh1_reg>;
- reg = <1>;
- regulator-name = "usbh_vbus";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio2 19 GPIO_ACTIVE_LOW>;
- vin-supply = <&sys_5v0_reg>;
- };
+ reg_usbh_vbus: regulator-usbh-vbus {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbh1_reg>;
+ regulator-name = "VCC_USB[1-4]";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ 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 {