diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-03-07 11:27:57 -0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-03 15:11:13 +0200 |
| commit | 9f754152c7afc4002f08e575bffa0868bacce1f5 (patch) | |
| tree | 05df1a4d6253e42ad630779062d6e11aa41b86fc | |
| parent | 76fa0bfd53182008940ddb1f245026db74f8244a (diff) | |
ARM: dts: imx7-colibri: move USB power enable to carrier board
The logic to enable USB power is part of the carrier board and
might differ depending on the carrier board design. Introduce basic
fixed regulators for power input and move the USB power enable
regulator to the carrier board device tree.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 27 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 2 |
3 files changed, 33 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index d7cad2dde541..44ba368ad856 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -44,6 +44,31 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbc_det>; }; + + reg_3v3: regulator-3v3 { + compatible = "regulator-fixed"; + regulator-name = "3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + reg_5v0: regulator-5v0 { + compatible = "regulator-fixed"; + regulator-name = "5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + 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 = <&gpio4 7 GPIO_ACTIVE_LOW>; + vin-supply = <®_5v0>; + }; }; &bl { @@ -262,7 +287,7 @@ &usbotg1 { extcon = <&extcon_usbc_det>; - vbus-supply = <®_usb_otg2_vbus>; + vbus-supply = <®_usbh_vbus>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 29b1b18cb28a..775a7bdaa6ee 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -39,14 +39,6 @@ regulator-max-microvolt = <3300000>; }; - reg_usb_otg2_vbus: regulator-usb-otg2-vbus { - compatible = "regulator-fixed"; - regulator-name = "usb_otg2_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; - }; - sound { compatible = "fsl,imx7d-colibri-sgtl5000", "fsl,imx-audio-sgtl5000"; @@ -295,7 +287,6 @@ imx7d-colibri { pinctrl_hog_1: hoggrp-1 { fsl,pins = < - MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */ MX7D_PAD_UART3_RTS_B__GPIO4_IO6 0x14 /* SODIMM 131 USBH OC */ MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3 0x74 /* SODIMM 55 */ MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2 0x74 /* SODIMM 63 */ @@ -592,6 +583,12 @@ >; }; + pinctrl_usbh1_reg: gpio_usbh_reg { + fsl,pins = < + MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */ + >; + }; + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX7D_PAD_SD1_CMD__SD1_CMD 0x59 diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts index c66964d68902..7608602d748b 100644 --- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts @@ -18,6 +18,6 @@ }; &usbotg2 { - vbus-supply = <®_usb_otg2_vbus>; + vbus-supply = <®_usbh_vbus>; status = "okay"; }; |