Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / imx53-m53evk.dts

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index 53f40885c530637c1776dc6172764cf6669f918d..dcee1e0f968fced3944ee2b6693bf22c61449ec0 100644 (file)
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -84,6 +84,15 @@
                        regulator-max-microvolt = <5000000>;
                        gpio = <&gpio1 2 0>;
                };
+
+               reg_usb_otg_vbus: regulator@4 {
+                       compatible = "regulator-fixed";
+                       reg = <4>;
+                       regulator-name = "usb_otg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio1 4 0>;
+               };
        };
 
        sound {
@@ -168,6 +177,12 @@
                        >;
                };
 
+               pinctrl_usbotg: usbotggrp {
+                       fsl,pins = <
+                               MX53_PAD_GPIO_4__GPIO1_4                0x000b0
+                       >;
+               };
+
                led_pin_gpio: led_gpio@0 {
                        fsl,pins = <
                                MX53_PAD_PATA_DATA8__GPIO2_8            0x80000000
@@ -351,6 +366,10 @@
 };
 
 &usbotg {
-       dr_mode = "peripheral";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg>;
+       dr_mode = "otg";
+       vbus-supply = <&reg_usb_otg_vbus>;
+       disable-over-current;
        status = "okay";
 };