2018-03-27 01:25:55 +00:00
|
|
|
From 160685d2e3325c31b65fec8d7635a5f82d22c073 Mon Sep 17 00:00:00 2001
|
2018-03-13 00:38:59 +00:00
|
|
|
From: Joshua Clayton <stillcompiling@gmail.com>
|
|
|
|
|
Date: Wed, 21 Jun 2017 14:42:08 +0800
|
2018-03-27 01:25:55 +00:00
|
|
|
Subject: [PATCH 13/13] ARM: dts: imx6q-evi: Fix onboard hub reset line
|
2018-03-13 00:38:59 +00:00
|
|
|
|
|
|
|
|
Previously the onboard hub was made to work by treating its
|
|
|
|
|
reset gpio as a regulator enable.
|
|
|
|
|
Get rid of that kludge now that pwseq has added reset gpio support
|
|
|
|
|
Move pin muxing the hub reset pin into the usbh1 group
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
|
|
|
|
|
Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
|
|
|
---
|
|
|
|
|
arch/arm/boot/dts/imx6q-evi.dts | 25 +++++++------------------
|
|
|
|
|
1 file changed, 7 insertions(+), 18 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts
|
|
|
|
|
index e0aea782c666..6f3afffc8faa 100644
|
|
|
|
|
--- a/arch/arm/boot/dts/imx6q-evi.dts
|
|
|
|
|
+++ b/arch/arm/boot/dts/imx6q-evi.dts
|
|
|
|
|
@@ -54,18 +54,6 @@
|
|
|
|
|
reg = <0x10000000 0x40000000>;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
- reg_usbh1_vbus: regulator-usbhubreset {
|
|
|
|
|
- compatible = "regulator-fixed";
|
|
|
|
|
- regulator-name = "usbh1_vbus";
|
|
|
|
|
- regulator-min-microvolt = <5000000>;
|
|
|
|
|
- regulator-max-microvolt = <5000000>;
|
|
|
|
|
- enable-active-high;
|
|
|
|
|
- startup-delay-us = <2>;
|
|
|
|
|
- pinctrl-names = "default";
|
|
|
|
|
- pinctrl-0 = <&pinctrl_usbh1_hubreset>;
|
|
|
|
|
- gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
|
|
|
|
|
- };
|
|
|
|
|
-
|
|
|
|
|
reg_usb_otg_vbus: regulator-usbotgvbus {
|
|
|
|
|
compatible = "regulator-fixed";
|
|
|
|
|
regulator-name = "usb_otg_vbus";
|
|
|
|
|
@@ -213,12 +201,18 @@
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
&usbh1 {
|
|
|
|
|
- vbus-supply = <®_usbh1_vbus>;
|
|
|
|
|
pinctrl-names = "default";
|
|
|
|
|
pinctrl-0 = <&pinctrl_usbh1>;
|
|
|
|
|
dr_mode = "host";
|
|
|
|
|
disable-over-current;
|
|
|
|
|
status = "okay";
|
|
|
|
|
+
|
|
|
|
|
+ usb2415host: hub@1 {
|
|
|
|
|
+ compatible = "usb424,2513";
|
|
|
|
|
+ reg = <1>;
|
|
|
|
|
+ reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
|
|
|
|
|
+ reset-duration-us = <3000>;
|
|
|
|
|
+ };
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
&usbotg {
|
|
|
|
|
@@ -481,11 +475,6 @@
|
|
|
|
|
MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0
|
|
|
|
|
/* usbh1_b OC */
|
|
|
|
|
MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0
|
|
|
|
|
- >;
|
|
|
|
|
- };
|
|
|
|
|
-
|
|
|
|
|
- pinctrl_usbh1_hubreset: usbh1hubresetgrp {
|
|
|
|
|
- fsl,pins = <
|
|
|
|
|
MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0
|
|
|
|
|
>;
|
|
|
|
|
};
|
|
|
|
|
--
|
|
|
|
|
2.16.2
|
|
|
|
|
|
