diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-02-16 11:03:00 -0800 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2016-02-16 15:57:16 -0800 |
| commit | 1fbb8a7b8fc5872ec1c11a1187f4b01692da60e1 (patch) | |
| tree | 4726ea09ddd1afa89df7f74af41ebca55507b0ef /arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | |
| parent | b76fca63745749d72e9530523edcb7712bcb9926 (diff) | |
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, name
the regulators according to schematics.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/vf-colibri-eval-v3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 43 |
1 files changed, 17 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 d36bf167b1a2..a0899eb7ece9 100644 --- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi @@ -25,32 +25,23 @@ backlight = <&bl>; }; - 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>; + regulator-always-on; + }; - /* 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 = <®_5v0>; }; gpio-keys { @@ -145,7 +136,7 @@ }; &usbh1 { - vbus-supply = <&usbh_vbus_reg>; + vbus-supply = <®_usbh_vbus>; }; &iomuxc { |