From 0b8e9bfe138b89d4b5369b329373613450790839 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Mon, 17 Sep 2012 10:01:45 -0300
Subject: [PATCH] --- yaml --- r: 326871 b: refs/heads/master c:
 b493129482851ad34c43db3369b2750fc59aa249 h: refs/heads/master i:   326869:
 318b1f8b7ebecff54e8f0a365478421d1a84fb41   326867:
 a71228b5890691b2d0504fcadc1e3ae03716d29c   326863:
 437cd6422c4c3f817955a6c479e56dc399a8106b v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/boot/dts/imx23-olinuxino.dts | 26 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 606fa04267b3..555049eed9ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6475317b569d531730c07bbc27b29257c348fd0
+refs/heads/master: b493129482851ad34c43db3369b2750fc59aa249
diff --git a/trunk/arch/arm/boot/dts/imx23-olinuxino.dts b/trunk/arch/arm/boot/dts/imx23-olinuxino.dts
index 711dcf5742b6..384d8b66f337 100644
--- a/trunk/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/trunk/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -40,6 +40,7 @@
 					reg = <0>;
 					fsl,pinmux-ids = <
 						0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */
+						0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */
 					>;
 					fsl,drive-strength = <0>;
 					fsl,voltage = <1>;
@@ -60,6 +61,31 @@
 				pinctrl-0 = <&auart0_2pins_a>;
 				status = "okay";
 			};
+
+			usbphy0: usbphy@8007c000 {
+				status = "okay";
+			};
+		};
+	};
+
+	ahb@80080000 {
+		usb0: usb@80080000 {
+			vbus-supply = <&reg_usb0_vbus>;
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_usb0_vbus: usb0_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb0_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			enable-active-high;
+			startup-delay-us = <300>; /* LAN9215 requires a POR of 200us minimum */
+			gpio = <&gpio0 17 0>;
 		};
 	};