summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-04-07 18:29:25 +0400
committerShawn Guo <shawn.guo@freescale.com>2014-04-14 06:22:38 +0400
commit465ca5dc4ad57b40ea632aabb32bf81a66632c4a (patch)
tree353a70428306324a17c598ebe4b0e24a7c48a9ed /arch/arm/boot/dts
parent19f7cb6dec7408da8753bf3250098edab60cdbb6 (diff)
downloadlinux-465ca5dc4ad57b40ea632aabb32bf81a66632c4a.tar.xz
ARM: dts: imx6: edmqmx6: Do not use the OTG switch as VBUS regulator
GPIO7_12 switches the D+/D- USB lines on and off. When we use this as VBUS regulator it means that USB device mode can never work as VBUS is never turned on in Device mode. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index 39ffa766384f..af32944cf9ae 100644
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -40,13 +40,15 @@
regulator-always-on;
};
- reg_usb_otg_vbus: regulator@1 {
+ reg_usb_otg_switch: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
- regulator-name = "usb_otg_vbus";
+ regulator-name = "usb_otg_switch";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio7 12 0>;
+ regulator-boot-on;
+ regulator-always-on;
};
reg_usb_host1: regulator@2 {
@@ -348,7 +350,6 @@
};
&usbotg {
- vbus-supply = <&reg_usb_otg_vbus>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg>;
disable-over-current;