Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "hwmon: qpnp-adc-voltage: Add version check for VADC thermistor channels"

This commit is contained in:
Linux Build Service Account 2015-05-28 14:58:54 -07:00 committed by Gerrit - the friendly Code Review server
parent 5e4b0bb37c 18e1a9e525
commit 5e453077d2
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwmon/qpnp-adc-common.c
View File

@ -2035,6 +2035,10 @@ int qpnp_adc_get_revid_version(struct device *dev)
(revid_data->pmic_type == PMI8994_V1P0_TYPE) &&
(revid_data->pmic_subtype == PMI8994_V1P0_SUBTYPE))
return QPNP_REV_ID_PMI8994_1_0;
else if ((revid_data->rev4 == PM8950_V1P0_REV4) &&
(revid_data->pmic_type == PM8950_V1P0_TYPE) &&
(revid_data->pmic_subtype == PM8950_V1P0_SUBTYPE))
return QPNP_REV_ID_PM8950_1_0;
else
return -EINVAL;
}

26
drivers/hwmon/qpnp-adc-voltage.c
View File

@ -665,6 +665,28 @@ static int32_t qpnp_vadc_version_check(struct qpnp_vadc_chip *dev)
return 0;
}
static int32_t
qpnp_vadc_channel_post_scaling_calib_check(struct qpnp_vadc_chip *vadc,
int channel)
{
int version, rc = 0;
version = qpnp_adc_get_revid_version(vadc->dev);
if (version == QPNP_REV_ID_PM8950_1_0) {
if ((channel == LR_MUX7_HW_ID) ||
(channel == P_MUX2_1_1) ||
(channel == LR_MUX3_XO_THERM) ||
(channel == LR_MUX3_BUF_XO_THERM_BUF)) {
vadc->adc->amux_prop->chan_prop->calib_type =
CALIB_ABSOLUTE;
return rc;
}
}
return -EINVAL;
}
#define QPNP_VBAT_COEFF_1 3000
#define QPNP_VBAT_COEFF_2 45810000
#define QPNP_VBAT_COEFF_3 100000
@ -1734,6 +1756,10 @@ recalibrate:
goto fail_unlock;
}
rc = qpnp_vadc_channel_post_scaling_calib_check(vadc, channel);
if (rc < 0)
pr_debug("Post scaling calib type not updated\n");
vadc_scale_fn[scale_type].chan(vadc, result->adc_code,
vadc->adc->adc_prop, vadc->adc->amux_prop->chan_prop, result);

1
include/linux/qpnp/qpnp-adc.h
View File

@ -1111,6 +1111,7 @@ struct qpnp_adc_amux_properties {
#define QPNP_REV_ID_8909_1_0 13
#define QPNP_REV_ID_8909_1_1 14
#define QPNP_REV_ID_PMI8994_1_0 15
#define QPNP_REV_ID_PM8950_1_0 16
/* Public API */
#if defined(CONFIG_SENSORS_QPNP_ADC_VOLTAGE) \