From 0852eaf3d4ddc72042e61ff83d7d90601eed764e Mon Sep 17 00:00:00 2001 From: Praveen Chidambaram Date: Wed, 22 Aug 2012 11:50:34 -0600 Subject: [PATCH] msm: Remove incorrect SAW2 PMIC DATA commands SAW v2.2 does not support PMIC_DLY. Remove the incorrect mapping in the probe method. Also, PMIC_DATA0 is used by L2 SPM for enabling the S5 gang in SAW v2.2. Using this to buffer the S5 gang voltage is unnecessary and incorrect. Signed-off-by: Praveen Chidambaram (cherry picked from commit 2772d83b3a783d1de5ef52c3d276b3572238309f) Change-Id: Ia7c928259dd57b2905ede182157d0adafc8dfad7 Signed-off-by: Sudhir Sharma --- arch/arm/mach-msm/spm-v2.c | 3 --- arch/arm/mach-msm/spm_devices.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-msm/spm-v2.c b/arch/arm/mach-msm/spm-v2.c index b6d532424f5..3d3158187a6 100644 --- a/arch/arm/mach-msm/spm-v2.c +++ b/arch/arm/mach-msm/spm-v2.c @@ -151,9 +151,6 @@ static inline void msm_spm_drv_set_vctl2(struct msm_spm_driver_data *dev, dev->reg_shadow[MSM_SPM_REG_SAW2_VCTL] &= ~0x700FF; dev->reg_shadow[MSM_SPM_REG_SAW2_VCTL] |= pmic_data; - - dev->reg_shadow[MSM_SPM_REG_SAW2_PMIC_DATA_0] &= ~0x700FF; - dev->reg_shadow[MSM_SPM_REG_SAW2_PMIC_DATA_0] |= pmic_data; } static inline void msm_spm_drv_apcs_set_vctl(struct msm_spm_driver_data *dev, diff --git a/arch/arm/mach-msm/spm_devices.c b/arch/arm/mach-msm/spm_devices.c index f04426d5bd1..6d7972af91d 100644 --- a/arch/arm/mach-msm/spm_devices.c +++ b/arch/arm/mach-msm/spm_devices.c @@ -248,10 +248,10 @@ static int __devinit msm_spm_dev_probe(struct platform_device *pdev) {"qcom,saw2-cfg", MSM_SPM_REG_SAW2_CFG}, {"qcom,saw2-avs-ctl", MSM_SPM_REG_SAW2_AVS_CTL}, {"qcom,saw2-avs-hysteresis", MSM_SPM_REG_SAW2_AVS_HYSTERESIS}, - {"qcom,saw2-spm-ctl", MSM_SPM_REG_SAW2_SPM_CTL}, - {"qcom,saw2-pmic-dly", MSM_SPM_REG_SAW2_PMIC_DLY}, {"qcom,saw2-avs-limit", MSM_SPM_REG_SAW2_AVS_LIMIT}, + {"qcom,saw2-avs-dly", MSM_SPM_REG_SAW2_AVS_DLY}, {"qcom,saw2-spm-dly", MSM_SPM_REG_SAW2_SPM_DLY}, + {"qcom,saw2-spm-ctl", MSM_SPM_REG_SAW2_SPM_CTL}, {"qcom,saw2-pmic-data0", MSM_SPM_REG_SAW2_PMIC_DATA_0}, {"qcom,saw2-pmic-data1", MSM_SPM_REG_SAW2_PMIC_DATA_1}, {"qcom,saw2-pmic-data2", MSM_SPM_REG_SAW2_PMIC_DATA_2},