From c0e4fe8c5351350d4a1f11453e462e87943da43b Mon Sep 17 00:00:00 2001
From: Vivek Gautam <gautam.vivek@samsung.com>
Date: Tue, 12 Feb 2013 15:24:15 -0800
Subject: [PATCH] --- yaml --- r: 372435 b: refs/heads/master c:
 13cbd1e3035210c7f81d60aa3cf82ebfe7d4b292 h: refs/heads/master i:   372433:
 13b914fd19773361dc16cabdcfb597fec7eed3ae   372431:
 f2f198e9924fba55cda317bed11f587aee18c0f8 v: v3

---
 [refs]                                        |  2 +-
 .../devicetree/bindings/usb/exynos-usb.txt    | 25 +++++++++++++++++++
 .../arch/arm/boot/dts/exynos5250-smdk5250.dts |  4 +++
 trunk/arch/arm/boot/dts/exynos5250-snow.dts   |  4 +++
 trunk/arch/arm/boot/dts/exynos5250.dtsi       |  6 +++++
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/usb/exynos-usb.txt

diff --git a/[refs] b/[refs]
index 71071ab453b1..828ba69d436f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad4aebe1efc6ec45fb5eb3a0c7996b62624d3528
+refs/heads/master: 13cbd1e3035210c7f81d60aa3cf82ebfe7d4b292
diff --git a/trunk/Documentation/devicetree/bindings/usb/exynos-usb.txt b/trunk/Documentation/devicetree/bindings/usb/exynos-usb.txt
new file mode 100644
index 000000000000..e8bbb4799e26
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/usb/exynos-usb.txt
@@ -0,0 +1,25 @@
+Samsung Exynos SoC USB controller
+
+The USB devices interface with USB controllers on Exynos SOCs.
+The device node has following properties.
+
+EHCI
+Required properties:
+ - compatible: should be "samsung,exynos4210-ehci" for USB 2.0
+   EHCI controller in host mode.
+ - reg: physical base address of the controller and length of memory mapped
+   region.
+ - interrupts: interrupt number to the cpu.
+
+Optional properties:
+ - samsung,vbus-gpio:  if present, specifies the GPIO that
+   needs to be pulled up for the bus to be powered.
+
+Example:
+
+	usb@12110000 {
+		compatible = "samsung,exynos4210-ehci";
+		reg = <0x12110000 0x100>;
+		interrupts = <0 71 0>;
+		samsung,vbus-gpio = <&gpx2 6 1 3 3>;
+	};
diff --git a/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts b/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 907d404b2120..a8d7233866fa 100644
--- a/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -232,6 +232,10 @@
 		samsung,audio-codec = <&wm8994>;
 	};
 
+	usb@12110000 {
+		samsung,vbus-gpio = <&gpx2 6 1 3 3>;
+	};
+
 	dp-controller {
 		samsung,color-space = <0>;
 		samsung,dynamic-range = <0>;
diff --git a/trunk/arch/arm/boot/dts/exynos5250-snow.dts b/trunk/arch/arm/boot/dts/exynos5250-snow.dts
index 17dd951c1cd2..47b6b847b4a5 100644
--- a/trunk/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/trunk/arch/arm/boot/dts/exynos5250-snow.dts
@@ -40,4 +40,8 @@
 				<&gpc4 5 2 3 0>, <&gpc4 6 2 3 0>;
 		};
 	};
+
+	usb@12110000 {
+		samsung,vbus-gpio = <&gpx1 1 1 3 3>;
+	};
 };
diff --git a/trunk/arch/arm/boot/dts/exynos5250.dtsi b/trunk/arch/arm/boot/dts/exynos5250.dtsi
index 56159a2f5765..5f1c1f3ea009 100644
--- a/trunk/arch/arm/boot/dts/exynos5250.dtsi
+++ b/trunk/arch/arm/boot/dts/exynos5250.dtsi
@@ -301,6 +301,12 @@
 		dma-names = "tx", "rx";
 	};
 
+	usb@12110000 {
+		compatible = "samsung,exynos4210-ehci";
+		reg = <0x12110000 0x100>;
+		interrupts = <0 71 0>;
+	};
+
 	amba {
 		#address-cells = <1>;
 		#size-cells = <1>;