---

yaml --- r: 355596 b: refs/heads/master c: 031b77a h: refs/heads/master v: v3
git-mirror · Jan 29, 2013 · 77cedb1 · 77cedb1
1 parent ae87d32
commit 77cedb1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b16f9183c7c1918a3a5c36d35482f5e01dc9c384
+refs/heads/master: 031b77afc374cf1b86dbcda5dfa6e1bbb989836c
diff --git a/trunk/arch/arm/boot/dts/tegra114.dtsi b/trunk/arch/arm/boot/dts/tegra114.dtsi
@@ -54,6 +54,12 @@
 		interrupt-controller;
 	};
 
+	pinmux: pinmux {
+		compatible = "nvidia,tegra114-pinmux";
+		reg = <0x70000868 0x148		/* Pad control registers */
+		       0x70003000 0x40c>;	/* Mux registers */
+	};
+
 	serial@70006000 {
 		compatible = "nvidia,tegra114-uart", "nvidia,tegra20-uart";
 		reg = <0x70006000 0x40>;