From 2ce3a1e6d7ffd9b58e4076df71e83441a2d1493a Mon Sep 17 00:00:00 2001
From: Philip Avinash <avinashphilip@ti.com>
Date: Thu, 2 May 2013 15:14:03 +0530
Subject: [PATCH] --- yaml --- r: 375023 b: refs/heads/master c:
 e45879ec26928036e09f80c4f72470370629f3a4 h: refs/heads/master i:   375021:
 46b2c38826a3d09d72f5adf1ee0c5b49f0ca6853   375019:
 ed363669fc2add50f0083ac129d17edcd8cc020c   375015:
 a4cafc50d84c57c49e9fa099651e0b26c4372b8a   375007:
 45385aabbe16a865244a44a38ba0105fc96e7e02 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/boot/dts/am33xx.dtsi | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a90aad13a661..d3b176befd84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45465c5e592fa86466173b7eab83730e9d3fe041
+refs/heads/master: e45879ec26928036e09f80c4f72470370629f3a4
diff --git a/trunk/arch/arm/boot/dts/am33xx.dtsi b/trunk/arch/arm/boot/dts/am33xx.dtsi
index d1101103aa51..1460d9b88adf 100644
--- a/trunk/arch/arm/boot/dts/am33xx.dtsi
+++ b/trunk/arch/arm/boot/dts/am33xx.dtsi
@@ -403,5 +403,17 @@
 			       0x44d80000 0x2000>;	/* M3 DMEM */
 			ti,hwmods = "wkup_m3";
 		};
+
+		gpmc: gpmc@50000000 {
+			compatible = "ti,am3352-gpmc";
+			ti,hwmods = "gpmc";
+			reg = <0x50000000 0x2000>;
+			interrupts = <100>;
+			num-cs = <7>;
+			num-waitpins = <2>;
+			#address-cells = <2>;
+			#size-cells = <1>;
+			status = "disabled";
+		};
 	};
 };