From 2d7ea9710586b4d3b9b72d043fbd1bfc48ba4196 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Wed, 19 Sep 2012 16:02:51 +0530
Subject: [PATCH] --- yaml --- r: 339877 b: refs/heads/master c:
 3ce0a99cd4c23762441f0efb18c0e0ef1e9d8bfc h: refs/heads/master i:   339875:
 f1e05ab791b8ec9140aecb4fb91c489c35032769 v: v3

---
 [refs]                                         |  2 +-
 .../devicetree/bindings/bus/omap-ocp2scp.txt   | 18 ++++++++++++++++++
 trunk/arch/arm/boot/dts/omap4.dtsi             |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3b8e67dc7f4..180b2181be10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8de91a24d66507f7ed81d4077c27014d91ed4c6
+refs/heads/master: 3ce0a99cd4c23762441f0efb18c0e0ef1e9d8bfc
diff --git a/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
index d2fe064a828b..63dd8051521c 100644
--- a/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
+++ b/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
@@ -2,9 +2,27 @@
 
 properties:
 - compatible : Should be "ti,omap-ocp2scp"
+- reg : Address and length of the register set for the device
 - #address-cells, #size-cells : Must be present if the device has sub-nodes
 - ranges : the child address space are mapped 1:1 onto the parent address space
 - ti,hwmods : must be "ocp2scp_usb_phy"
 
 Sub-nodes:
 All the devices connected to ocp2scp are described using sub-node to ocp2scp
+
+ocp2scp@4a0ad000 {
+	compatible = "ti,omap-ocp2scp";
+	reg = <0x4a0ad000 0x1f>;
+	#address-cells = <1>;
+	#size-cells = <1>;
+	ranges;
+	ti,hwmods = "ocp2scp_usb_phy";
+
+	subnode1 {
+	...
+	};
+
+	subnode2 {
+	...
+	};
+};
diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi
index 3883f94fdbd0..812461efdea6 100644
--- a/trunk/arch/arm/boot/dts/omap4.dtsi
+++ b/trunk/arch/arm/boot/dts/omap4.dtsi
@@ -431,8 +431,9 @@
 			hw-caps-temp-alert;
 		};
 
-		ocp2scp {
+		ocp2scp@4a0ad000 {
 			compatible = "ti,omap-ocp2scp";
+			reg = <0x4a0ad000 0x1f>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges;