From 16563d5992a4eae3cf5c991f5bebd04abf48259b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 3 Sep 2012 16:15:25 +0200
Subject: [PATCH] --- yaml --- r: 326745 b: refs/heads/master c:
 186e3d943a2e8cd42b2c87cba7413168e8159d3e h: refs/heads/master i:   326743:
 8f937ed325cc2bd243c554d55ee8f2813ff43149 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/boot/dts/imx28-cfa10049.dts | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 254cb508487e..95677df24750 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db84c038d6d7ff5ad1f18e2613b4d67583a7e40f
+refs/heads/master: 186e3d943a2e8cd42b2c87cba7413168e8159d3e
diff --git a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts b/trunk/arch/arm/boot/dts/imx28-cfa10049.dts
index e0e4b8cad628..557befe1830d 100644
--- a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/trunk/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -26,6 +26,31 @@
 				pinctrl-0 = <&i2c1_pins_a>;
 				status = "okay";
 			};
+
+			usbphy1: usbphy@8007e000 {
+				status = "okay";
+			};
+		};
+	};
+
+	ahb@80080000 {
+		usb1: usb@80090000 {
+			vbus-supply = <&reg_usb1_vbus>;
+			pinctrl-0 = <&usbphy1_pins_a>;
+			pinctrl-names = "default";
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_usb1_vbus: usb1_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb1_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			gpio = <&gpio0 7 1>;
 		};
 	};
 };