commit f9a9c1ae110688e86702e84e0a8711985f4cef88
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 30 02:32:42 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Aug 30 02:32:41 2013 -0700
tree 1e156d1f1a8d07dc16d5c5e0e3c72485208ca68b
parent 9b2ac2bf6a25675f6f07cf478ae7b0636faf6c53
parent 1bdfc0a77e8f9cd8f8023bd3f932d66e2c2361d0

Merge "ARM: dts: msm: Add light and proximity sensor for QRD8612"

arch/arm/boot/dts/msm8610-v1-qrd-skuab.dts

diff --git a/arch/arm/boot/dts/msm8610-v1-qrd-skuab.dts b/arch/arm/boot/dts/msm8610-v1-qrd-skuab.dts
index b4559ff..d7a446d 100644
--- a/arch/arm/boot/dts/msm8610-v1-qrd-skuab.dts
+++ b/arch/arm/boot/dts/msm8610-v1-qrd-skuab.dts
@@ -79,6 +79,23 @@
 			fsl,irq-gpio = <&msmgpio 81 0x00>;
 			fsl,sensors-position = <1>;
 		};
+		stk@48 {
+			compatible = "stk,stk3x1x";
+			reg = <0x48>;
+			interrupt-parent = <&msmgpio>;
+			interrupts = <80 0x2>;
+			vdd-supply = <&pm8110_l19>;
+			vio-supply = <&pm8110_l14>;
+			stk,irq-gpio = <&msmgpio 80 0x02>;
+			stk,transmittance = <100>;
+			stk,state-reg = <0x00>;
+			stk,psctrl-reg = <0x71>;
+			stk,alsctrl-reg = <0x3e>;
+			stk,ledctrl-reg = <0xFF>;
+			stk,wait-reg = <0x07>;
+			stk,ps-thdh = <150>;
+			stk,ps-thdl = <100>;
+		};
 	};
 
 	usb@f9a55000 {