---

yaml --- r: 342171 b: refs/heads/master c: 6b8db13 h: refs/heads/master i: 342169: 0b2e2ef 342167: 061ba59 v: v3
git-mirror · Nov 1, 2012 · d80dd91 · d80dd91
1 parent 66fa21d
commit d80dd91
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd06fafffbd8c8267e5cf945ddc318045e7682db
+refs/heads/master: 6b8db1326a67440e23f668f0e2b258e5e4127b82
diff --git a/trunk/arch/arm/boot/dts/href.dtsi b/trunk/arch/arm/boot/dts/href.dtsi
@@ -16,6 +16,17 @@
 		reg = <0x00000000 0x20000000>;
 	};
 
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		button@1 {
+			linux,code = <11>;
+			label = "SFH7741 Proximity Sensor";
+		};
+	};
+
 	soc-u9500 {
 		uart@80120000 {
 			status = "okay";

diff --git a/trunk/arch/arm/boot/dts/hrefprev60.dts b/trunk/arch/arm/boot/dts/hrefprev60.dts
@@ -17,6 +17,12 @@
 	model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
 	compatible = "st-ericsson,mop500";
 
+	gpio_keys {
+		button@1 {
+			gpios = <&tc3589x_gpio 7 0x4>;
+		};
+	};
+
 	soc-u9500 {
 		i2c@80004000 {
 			tps61052@33 {

diff --git a/trunk/arch/arm/boot/dts/hrefv60plus.dts b/trunk/arch/arm/boot/dts/hrefv60plus.dts
@@ -16,4 +16,10 @@
 / {
 	model = "ST-Ericsson HREF (v60+) platform with Device Tree";
 	compatible = "st-ericsson,hrefv60+";
+
+	gpio_keys {
+		button@1 {
+			gpios = <&gpio6 25 0x4>;
+		};
+	};
 };