github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: qcom-spmi-adc5: add SMB_TEMP channel for PMIC7

Browse Source 
Add support to read SMB_TEMP channel on PM8350B that is output by
charge pump (smb139x). When this virtual channel is read for
one of SMB139x charger pumps, PBS does the configuration for that
SMB139x appropriately.

Change-Id: Ia9af1ef78571c56898057d567117fcd9b7d28172
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
[quic_subbaram@quicinc.com: Fixed trivial merge conflict in
 qcom-vadc-common.h due to location change and changes from upstream
 merge]
Signed-off-by: Subbaraman Narayanamurthy <quic_subbaram@quicinc.com>
[quic_collinsd@quicinc.com: changed struct vadc_prescale_ratio to
 struct u32_fract]
Signed-off-by: David Collins <quic_collinsd@quicinc.com>
This commit is contained in:
Subbaraman Narayanamurthy 2020-08-05 20:41:19 -07:00 committed by David Collins
parent 5104aa0d97
commit dbc9f0e777
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/adc/qcom-spmi-adc5.c
View File

@ -616,6 +616,8 @@ static const struct adc5_channels adc7_chans_pmic[ADC5_MAX_CHANNEL] = {
SCALE_HW_CALIB_DEFAULT)
[ADC7_VBAT_SNS] = ADC5_CHAN_VOLT("vbat_sns", 3,
SCALE_HW_CALIB_DEFAULT)
[ADC7_AMUX_THM3] = ADC5_CHAN_TEMP("smb_temp", 0,
SCALE_HW_CALIB_PM7_SMB_TEMP)
[ADC7_DIE_TEMP] = ADC5_CHAN_TEMP("die_temp", 0,
SCALE_HW_CALIB_PMIC_THERM_PM7)
[ADC7_AMUX_THM1_100K_PU] = ADC5_CHAN_TEMP("amux_thm1_pu2", 0,

26
drivers/iio/adc/qcom-vadc-common.c
View File

@ -560,6 +560,10 @@ static int qcom_vadc_scale_hw_smb_temp(
const struct u32_fract *prescale,
const struct adc5_data *data,
u16 adc_code, int *result_mdec);
static int qcom_vadc_scale_hw_pm7_smb_temp(
const struct u32_fract *prescale,
const struct adc5_data *data,
u16 adc_code, int *result_mdec);
static int qcom_vadc_scale_hw_smb1398_temp(
const struct u32_fract *prescale,
const struct adc5_data *data,
@ -595,6 +599,7 @@ static struct qcom_adc5_scale_type scale_adc5_fn[] = {
[SCALE_HW_CALIB_PM5_CHG_TEMP] = {qcom_vadc_scale_hw_chg5_temp},
[SCALE_HW_CALIB_PM5_SMB_TEMP] = {qcom_vadc_scale_hw_smb_temp},
[SCALE_HW_CALIB_PM5_SMB1398_TEMP] = {qcom_vadc_scale_hw_smb1398_temp},
[SCALE_HW_CALIB_PM7_SMB_TEMP] = {qcom_vadc_scale_hw_pm7_smb_temp},
};
static int qcom_vadc_map_voltage_temp(const struct vadc_map_pt *pts,
@ -912,6 +917,27 @@ static int qcom_vadc7_scale_hw_calib_die_temp(
voltage, result_mdec);
}
static int qcom_vadc_scale_hw_pm7_smb_temp(
const struct u32_fract *prescale,
const struct adc5_data *data,
u16 adc_code, int *result_mdec)
{
s64 temp;
int result_uv;
result_uv = qcom_vadc_scale_code_voltage_factor(adc_code,
prescale, data, 1);
/* T(C) = 25 + (25*Vadc - 24.885) / 0.0894 */
temp = div_s64(((25000LL * result_uv) - (24885 * 1000000LL)) * 10000,
894 * 1000000) + 25000;
pr_debug("adc_code: %#x result_uv: %d temp: %lld\n", adc_code,
result_uv, temp);
*result_mdec = temp > 0 ? temp : 0;
return 0;
}
static int qcom_vadc_scale_hw_smb_temp(
const struct u32_fract *prescale,
const struct adc5_data *data,

8
include/linux/iio/adc/qcom-vadc-common.h
View File

@ -118,6 +118,8 @@ struct vadc_linear_graph {
* code.
* SCALE_HW_CALIB_PM5_SMB1398_TEMP: Returns result in millidegrees for PMIC5
* SMB1398 temperature.
* SCALE_HW_CALIB_PM7_SMB_TEMP: Returns result in millidegrees for PMIC7
* SMB139x temperature.
*/
enum vadc_scale_fn_type {
SCALE_DEFAULT = 0,
@ -128,16 +130,16 @@ enum vadc_scale_fn_type {
SCALE_HW_CALIB_DEFAULT,
SCALE_HW_CALIB_THERM_100K_PULLUP,
SCALE_HW_CALIB_XOTHERM,
SCALE_HW_CALIB_THERM_100K_PU_PM7,
SCALE_HW_CALIB_PMIC_THERM,
SCALE_HW_CALIB_CUR,
SCALE_HW_CALIB_PMIC_THERM_PM7,
SCALE_HW_CALIB_PM5_CHG_TEMP,
SCALE_HW_CALIB_PM5_SMB_TEMP,
SCALE_HW_CALIB_BATT_THERM_100K,
SCALE_HW_CALIB_BATT_THERM_30K,
SCALE_HW_CALIB_BATT_THERM_400K,
SCALE_HW_CALIB_PM5_SMB1398_TEMP,
SCALE_HW_CALIB_THERM_100K_PU_PM7,
SCALE_HW_CALIB_PMIC_THERM_PM7,
SCALE_HW_CALIB_PM7_SMB_TEMP,
SCALE_HW_CALIB_INVALID,
};