From 67e11a87215bff2c30466c152b2e70e38d6be723 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 6 Dec 2012 14:23:52 -0700
Subject: [PATCH] --- yaml --- r: 355753 b: refs/heads/master c:
 bff1ea70e748c5b57566a8dc99f0c5207a98d899 h: refs/heads/master i:   355751:
 f04ad43944743832e90832f49018bc4a48e4ad4e v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/boot/dts/tegra20-trimslice.dts | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bd56c935a09d..17c5c6ef17cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fef5dffdefcfa36769d32c38986d311274f6d41
+refs/heads/master: bff1ea70e748c5b57566a8dc99f0c5207a98d899
diff --git a/trunk/arch/arm/boot/dts/tegra20-trimslice.dts b/trunk/arch/arm/boot/dts/tegra20-trimslice.dts
index b70b4cb754c8..4b6c486ecea5 100644
--- a/trunk/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/trunk/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -249,6 +249,11 @@
 					"ld23_22";
 				nvidia,pull = <1>;
 			};
+			conf_spif {
+				nvidia,pins = "spif";
+				nvidia,pull = <1>;
+				nvidia,tristate = <0>;
+			};
 		};
 	};
 
@@ -322,6 +327,11 @@
 		bus-width = <4>;
 	};
 
+	poweroff {
+		compatible = "gpio-poweroff";
+		gpios = <&gpio 191 1>; /* gpio PX7, active low */
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;