From 640fa8d8d94983a94350a152dd907f1ea943fcfb Mon Sep 17 00:00:00 2001 From: Jishnu Prakash Date: Tue, 2 Mar 2021 09:26:31 +0530 Subject: [PATCH] iio: qcom-spmi-adc5: update scaling ratios for SMB_ICHG and SMB_IIN Update scaling ratios for SMB_ICHG and SMB_IIN ADC channels, following HW recommendation. Update default prescaling values used for SMB_IIN and ICHG_FB channels to match changes made in the prescaling array. Change-Id: I2b016e021d3c9e8b76cd5400c6790030da088093 Signed-off-by: Jishnu Prakash [quic_subbaram@quicinc.com: Fixed merge conflicts in qcom-spmi-adc5.c because common code moved to qcom-vadc-common.c] Signed-off-by: Subbaraman Narayanamurthy [quic_collinsd@quicinc.com: changed prescale "num" and "den" to "numerator" and "denominator" respectively] Signed-off-by: David Collins --- drivers/iio/adc/qcom-spmi-adc5.c | 6 +++--- drivers/iio/adc/qcom-vadc-common.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c index ea9d602f2185..97fbc8e35f7a 100644 --- a/drivers/iio/adc/qcom-spmi-adc5.c +++ b/drivers/iio/adc/qcom-spmi-adc5.c @@ -629,11 +629,11 @@ static const struct adc5_channels adc7_chans_pmic[ADC5_MAX_CHANNEL] = { SCALE_HW_CALIB_PM7_CHG_TEMP) [ADC7_IIN_FB] = ADC5_CHAN_CUR("iin_fb", 9, SCALE_HW_CALIB_CUR) + [ADC7_IIN_SMB] = ADC5_CHAN_CUR("iin_smb", 9, + SCALE_HW_CALIB_CUR) [ADC7_ICHG_SMB] = ADC5_CHAN_CUR("ichg_smb", 10, SCALE_HW_CALIB_CUR) - [ADC7_IIN_SMB] = ADC5_CHAN_CUR("iin_smb", 11, - SCALE_HW_CALIB_CUR) - [ADC7_ICHG_FB] = ADC5_CHAN_CUR("ichg_fb", 12, + [ADC7_ICHG_FB] = ADC5_CHAN_CUR("ichg_fb", 11, SCALE_HW_CALIB_CUR_RAW) [ADC7_DIE_TEMP] = ADC5_CHAN_TEMP("die_temp", 0, SCALE_HW_CALIB_PMIC_THERM_PM7) diff --git a/drivers/iio/adc/qcom-vadc-common.c b/drivers/iio/adc/qcom-vadc-common.c index 41e587cad3bd..e23d735d761d 100644 --- a/drivers/iio/adc/qcom-vadc-common.c +++ b/drivers/iio/adc/qcom-vadc-common.c @@ -531,9 +531,8 @@ static const struct u32_fract adc5_prescale_ratios[] = { { .numerator = 1, .denominator = 10 }, { .numerator = 1, .denominator = 16 }, /* Prescale ratios for current channels below */ - { .numerator = 32, .denominator = 100 }, /* IIN_FB */ - { .numerator = 14, .denominator = 100 }, /* ICHG_SMB */ - { .numerator = 28, .denominator = 100 }, /* IIN_SMB */ + { .numerator = 32, .denominator = 100 }, /* IIN_FB, IIN_SMB */ + { .numerator = 16, .denominator = 100 }, /* ICHG_SMB */ { .numerator = 1000, .denominator = 305185 }, /* ICHG_FB */ { .numerator = 1000, .denominator = 610370 }, /* ICHG_FB_2X */ };