commit 0e7baf038a37b1fe9d65900d04fd38c50947eec4
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 03 19:24:36 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 03 19:24:35 2013 -0700
tree c6db6a584245086c9a370853aa7c2e71486026ee
parent fd54cd3c0115312282043fae81673aaf7e3bc460
parent 6ef3456d9e61a818a808dc0de9decbdce5e7fce1

Merge "arm/dt: msm8610: Configure MPP4"

arch/arm/boot/dts/msm8610-cdp.dts

diff --git a/arch/arm/boot/dts/msm8610-cdp.dts b/arch/arm/boot/dts/msm8610-cdp.dts
index cdad6a7..1868a25 100644
--- a/arch/arm/boot/dts/msm8610-cdp.dts
+++ b/arch/arm/boot/dts/msm8610-cdp.dts
@@ -327,6 +327,12 @@
 	};
 
 	mpp@a300 { /* MPP 4 */
+		/* PA_THERM config */
+		qcom,mode = <4>; /* AIN input */
+		qcom,invert = <1>; /* Enable MPP */
+		qcom,ain-route = <3>; /* AMUX 8 */
+		qcom,master-en = <1>;
+		qcom,src-sel = <0>; /* Function constant */
 	};
 };
 

arch/arm/boot/dts/msm8610-mtp.dts

diff --git a/arch/arm/boot/dts/msm8610-mtp.dts b/arch/arm/boot/dts/msm8610-mtp.dts
index 222c4cb..b52bfc9 100644
--- a/arch/arm/boot/dts/msm8610-mtp.dts
+++ b/arch/arm/boot/dts/msm8610-mtp.dts
@@ -330,6 +330,12 @@
 	};
 
 	mpp@a300 { /* MPP 4 */
+		/* PA_THERM config */
+		qcom,mode = <4>; /* AIN input */
+		qcom,invert = <1>; /* Enable MPP */
+		qcom,ain-route = <3>; /* AMUX 8 */
+		qcom,master-en = <1>;
+		qcom,src-sel = <0>; /* Function constant */
 	};
 };