commit 2073d66b10202cba00cedad38a192aeca648488e
author Linux Build Service Account <lnxbuild@localhost> Sun Sep 16 00:32:59 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Sep 16 00:32:56 2012 -0700
tree f853f7db88e17825e19f6835273c57ec8f86fb6b
parent f6a91581b8526c3c7d76473c90a81269bad10e90
parent 0cf0826dca559d8a53e027ddebcceac67060c52e

Merge "msm: board-8930: Add support to read PA_THERM1"

arch/arm/mach-msm/board-8930-pmic.c

diff --git a/arch/arm/mach-msm/board-8930-pmic.c b/arch/arm/mach-msm/board-8930-pmic.c
index cc5651d..59e4ba1 100644
--- a/arch/arm/mach-msm/board-8930-pmic.c
+++ b/arch/arm/mach-msm/board-8930-pmic.c
@@ -180,6 +180,8 @@
 
 /* Initial PM8917 MPP configurations */
 static struct pm8xxx_mpp_init pm8917_mpps[] __initdata = {
+	PM8917_MPP_INIT(PM8XXX_AMUX_MPP_3, A_INPUT,
+				PM8XXX_MPP_AIN_AMUX_CH8, DIN_TO_INT),
 };
 
 void __init msm8930_pm8038_gpio_mpp_init(void)
@@ -527,6 +529,8 @@
 		ADC_DECIMATION_TYPE2, ADC_SCALE_XOTHERM},
 	{"pa_therm0", ADC_MPP_1_AMUX3, CHAN_PATH_SCALING1, AMUX_RSV1,
 		ADC_DECIMATION_TYPE2, ADC_SCALE_PA_THERM},
+	{"pa_therm1", ADC_MPP_1_AMUX8, CHAN_PATH_SCALING1, AMUX_RSV1,
+		ADC_DECIMATION_TYPE2, ADC_SCALE_PA_THERM},
 };
 
 static struct pm8xxx_adc_properties pm8917_adc_data = {