---

yaml --- r: 375023 b: refs/heads/master c: e45879e h: refs/heads/master i: 375021: 46b2c38 375019: ed36366 375015: a4cafc5 375007: 45385aa v: v3
git-mirror · May 9, 2013 · 2ce3a1e · 2ce3a1e
1 parent 96921f2
commit 2ce3a1e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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";
+		};
 	};
 };