Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 962f6eac authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hwmon: qpnp-adc-voltage: Avoid adc code check with recalibration"

parents 1846a103 01d25e15

drivers/hwmon/qpnp-adc-common.c

+4 −1
Original line number Diff line number Diff line
@@ -1529,8 +1529,11 @@ int32_t qpnp_adc_smb_btm_rscaler(struct qpnp_vadc_chip *chip, 
}

EXPORT_SYMBOL(qpnp_adc_smb_btm_rscaler);



int32_t qpnp_vadc_check_result(int32_t *data)

int32_t qpnp_vadc_check_result(int32_t *data, bool recalib_check)

{

	if (recalib_check)

		return 0;



	if (*data < QPNP_VADC_MIN_ADC_CODE)

		*data = QPNP_VADC_MIN_ADC_CODE;

	else if (*data > QPNP_VADC_MAX_ADC_CODE)

drivers/hwmon/qpnp-adc-voltage.c

+2 −1
Original line number Diff line number Diff line
@@ -459,7 +459,8 @@ static int32_t qpnp_vadc_read_conversion_result(struct qpnp_vadc_chip *vadc, 


	*data = (rslt_msb << 8) | rslt_lsb;



	status = qpnp_vadc_check_result(data);

	status = qpnp_vadc_check_result(data,

			(vadc->vadc_recalib_check ? true : false));

	if (status < 0) {

		pr_err("VADC data check failed\n");

		goto fail;

include/linux/qpnp/qpnp-adc.h

+2 −1
Original line number Diff line number Diff line
@@ -1123,8 +1123,9 @@ int32_t qpnp_vadc_conv_seq_request(struct qpnp_vadc_chip *dev, 
/**

 * qpnp_vadc_check_result() - Performs check on the ADC raw code.

 * @data:	Data used for verifying the range of the ADC code.

 * @recalib_check:	Recalibration check to ignore result check.

 */

int32_t qpnp_vadc_check_result(int32_t *data);

int32_t qpnp_vadc_check_result(int32_t *data, bool recalib_check);



/**

 * qpnp_adc_get_devicetree_data() - Abstracts the ADC devicetree data.