Merge tag 'fbdev-v4.13' of git://github.com/bzolnier/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap3-evm-common.dtsi

diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi
index 090475083c2f2861136bb4b8f5187422dd6a187b..2b1d6977a53572ead16e74ff97310fbd3cf7fcc3 100644 (file)
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -12,6 +12,24 @@
                };
        };
 
+       /* HS USB Port 2 Power */
+       hsusb2_power: hsusb2_power_reg {
+               compatible = "regulator-fixed";
+               regulator-name = "hsusb2_vbus";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; /* gpio_22 */
+               startup-delay-us = <70000>;
+               enable-active-high;
+       };
+
+       /* HS USB Host PHY on PORT 2 */
+       hsusb2_phy: hsusb2_phy {
+               compatible = "usb-nop-xceiv";
+               reset-gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; /* gpio_21 */
+               vcc-supply = <&hsusb2_power>;
+       };
+
        leds {
                compatible = "gpio-leds";
                ledb {
@@ -76,7 +94,6 @@
 
 &lcd_3v3 {
        gpio = <&gpio5 25 GPIO_ACTIVE_LOW>;     /* gpio153 */
-       enable-active-low;
 };
 
 &lcd0 {
@@ -143,6 +160,14 @@
                        >;
 };
 
+&usbhshost {
+       port2-mode = "ehci-phy";
+};
+
+&usbhsehci {
+       phys = <0 &hsusb2_phy>;
+};
+
 &usb_otg_hs {
        interface-type = <0>;
        usb-phy = <&usb2_phy>;
@@ -159,3 +184,10 @@
                reg = <5 0 0xff>;
        };
 };
+
+&vaux2 {
+       regulator-name = "usb_1v8";
+       regulator-min-microvolt = <1800000>;
+       regulator-max-microvolt = <1800000>;
+       regulator-always-on;
+};