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

Commit 2ba7ab50 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-current: Add temperature compensation"

parents 3de184f5 b69ed0a4

drivers/hwmon/qpnp-adc-common.c

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1117,6 +1117,13 @@ int qpnp_adc_get_revid_version(struct device *dev) 
		(revid_data->pmic_type == PM8941_V3P1_TYPE) &&

		(revid_data->pmic_subtype == PM8941_V3P1_SUBTYPE))

			return QPNP_REV_ID_8941_3_1;

	else if ((revid_data->rev1 == PM8226_V2P2_REV1) &&

		(revid_data->rev2 == PM8226_V2P2_REV2) &&

		(revid_data->rev3 == PM8226_V2P2_REV3) &&

		(revid_data->rev4 == PM8226_V2P2_REV4) &&

		(revid_data->pmic_type == PM8226_V2P2_TYPE) &&

		(revid_data->pmic_subtype == PM8226_V2P2_SUBTYPE))

			return QPNP_REV_ID_8026_2_2;

	else if ((revid_data->rev1 == PM8226_V2P1_REV1) &&

		(revid_data->rev2 == PM8226_V2P1_REV2) &&

		(revid_data->rev3 == PM8226_V2P1_REV3) &&

drivers/hwmon/qpnp-adc-current.c

+2 −0
Original line number Diff line number Diff line
@@ -435,6 +435,8 @@ static int32_t qpnp_iadc_comp(int64_t *result, struct qpnp_iadc_chip *iadc, 
		}

		break;

	case QPNP_REV_ID_8026_2_1:

	case QPNP_REV_ID_8026_2_2:

		/* pm8026 rev 2.1 and 2.2 */

		switch (iadc->iadc_comp.id) {

		case COMP_ID_GF:

			if (!iadc->iadc_comp.ext_rsense) {

include/linux/qpnp/qpnp-adc.h

+1 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,7 @@ struct qpnp_adc_amux_properties { 
#define QPNP_REV_ID_8110_1_0	4

#define QPNP_REV_ID_8026_2_1	5

#define QPNP_REV_ID_8110_2_0	6

#define QPNP_REV_ID_8026_2_2	7



/* Public API */

#if defined(CONFIG_SENSORS_QPNP_ADC_VOLTAGE)				\