summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7-colibri.dtsi
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2017-03-07 11:27:57 -0800
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-03 15:11:13 +0200
commit9f754152c7afc4002f08e575bffa0868bacce1f5 (patch)
tree05df1a4d6253e42ad630779062d6e11aa41b86fc /arch/arm/boot/dts/imx7-colibri.dtsi
parent76fa0bfd53182008940ddb1f245026db74f8244a (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>
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri.dtsi')
-rw-r--r--arch/arm/boot/dts/imx7-colibri.dtsi15
1 files changed, 6 insertions, 9 deletions
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