Merge "thermal: qpnp-adc-tm: add new scale function for skue battery thermistor" (c1160129) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/thermal/qpnp-adc-tm.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ Required properties:
		5 : Scaling to perform reverse calibration for absolute voltage from uV
		to raw ADC code.
		6 : Scaling to convert qrd skuh battery decidegC to raw ADC code.
		7 : Scaling to convert qrd skue battery decidegC to raw ADC code.
		- qcom,hw-settle-time : Settling period for the channel before ADC read.
		Select from the following unsigned int.
		0 : 0us

drivers/hwmon/qpnp-adc-common.c

+53 −0

Original line number	Diff line number	Diff line
		@@ -1673,6 +1673,59 @@ int32_t qpnp_adc_qrd_skut1_btm_scaler(struct qpnp_vadc_chip *chip,
		}
		EXPORT_SYMBOL(qpnp_adc_qrd_skut1_btm_scaler);

		int32_t qpnp_adc_qrd_skue_btm_scaler(struct qpnp_vadc_chip *chip,
		struct qpnp_adc_tm_btm_param *param,
		uint32_t low_threshold, uint32_t high_threshold)
		{
		struct qpnp_vadc_linear_graph btm_param;
		int64_t low_output = 0, high_output = 0;
		int rc = 0;

		qpnp_get_vadc_gain_and_offset(chip, &btm_param, CALIB_RATIOMETRIC);

		pr_debug("warm_temp:%d and cool_temp:%d\n", param->high_temp,
		param->low_temp);
		rc = qpnp_adc_map_voltage_temp(
		adcmap_qrd_skue_btm_threshold,
		ARRAY_SIZE(adcmap_qrd_skue_btm_threshold),
		(param->low_temp),
		&low_output);
		if (rc) {
		pr_debug("low_temp mapping failed with %d\n", rc);
		return rc;
		}

		pr_debug("low_output:%lld\n", low_output);
		low_output *= btm_param.dy;
		do_div(low_output, btm_param.adc_vref);
		low_output += btm_param.adc_gnd;

		rc = qpnp_adc_map_voltage_temp(
		adcmap_qrd_skue_btm_threshold,
		ARRAY_SIZE(adcmap_qrd_skue_btm_threshold),
		(param->high_temp),
		&high_output);
		if (rc) {
		pr_debug("high temp mapping failed with %d\n", rc);
		return rc;
		}

		pr_debug("high_output:%lld\n", high_output);
		high_output *= btm_param.dy;
		do_div(high_output, btm_param.adc_vref);
		high_output += btm_param.adc_gnd;

		/* btm low temperature correspondes to high voltage threshold */
		*low_threshold = high_output;
		/* btm high temperature correspondes to low voltage threshold */
		*high_threshold = low_output;

		pr_debug("high_volt:%d, low_volt:%d\n", *high_threshold,
		*low_threshold);
		return 0;
		}
		EXPORT_SYMBOL(qpnp_adc_qrd_skue_btm_scaler);

		int32_t qpnp_adc_smb_btm_rscaler(struct qpnp_vadc_chip *chip,
		struct qpnp_adc_tm_btm_param *param,
		uint32_t low_threshold, uint32_t high_threshold)

drivers/thermal/qpnp-adc-tm.c

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2017, 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
		@@ -306,6 +306,7 @@ static struct qpnp_adc_tm_reverse_scale_fn adc_tm_rscale_fn[] = {
		[SCALE_R_ABSOLUTE] = {qpnp_adc_absolute_rthr},
		[SCALE_QRD_SKUH_RBATT_THERM] = {qpnp_adc_qrd_skuh_btm_scaler},
		[SCALE_QRD_SKUT1_RBATT_THERM] = {qpnp_adc_qrd_skut1_btm_scaler},
		[SCALE_QRD_SKUE_RBATT_THERM] = {qpnp_adc_qrd_skue_btm_scaler},
		};

		static int32_t qpnp_adc_tm_read_reg(struct qpnp_adc_tm_chip *chip,

include/linux/qpnp/qpnp-adc.h

+21 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,7 @@ enum qpnp_adc_tm_rscale_fn_type {
		SCALE_R_ABSOLUTE,
		SCALE_QRD_SKUH_RBATT_THERM,
		SCALE_QRD_SKUT1_RBATT_THERM,
		SCALE_QRD_SKUE_RBATT_THERM,
		SCALE_RSCALE_NONE,
		};

		@@ -1717,6 +1718,22 @@ int32_t qpnp_adc_qrd_skuh_btm_scaler(struct qpnp_vadc_chip *dev,
		int32_t qpnp_adc_qrd_skut1_btm_scaler(struct qpnp_vadc_chip *dev,
		struct qpnp_adc_tm_btm_param *param,
		uint32_t low_threshold, uint32_t high_threshold);
		/**
		* qpnp_adc_qrd_skue_btm_scaler() - Performs reverse calibration on the low/high
		* temperature threshold values passed by the client.
		* The function maps the temperature to voltage and applies
		* ratiometric calibration on the voltage values for SKUT1 board.
		* @dev: Structure device for qpnp vadc
		* @param: The input parameters that contain the low/high temperature
		* values.
		* @low_threshold: The low threshold value that needs to be updated with
		* the above calibrated voltage value.
		* @high_threshold: The low threshold value that needs to be updated with
		* the above calibrated voltage value.
		*/
		int32_t qpnp_adc_qrd_skue_btm_scaler(struct qpnp_vadc_chip *dev,
		struct qpnp_adc_tm_btm_param *param,
		uint32_t low_threshold, uint32_t high_threshold);
		/**
		* qpnp_adc_tm_scale_therm_voltage_pu2() - Performs reverse calibration
		* and convert given temperature to voltage on supported
		@@ -2061,6 +2078,10 @@ static inline int32_t qpnp_adc_qrd_skut1_btm_scaler(struct qpnp_vadc_chip *dev,
		struct qpnp_adc_tm_btm_param *param,
		uint32_t low_threshold, uint32_t high_threshold)
		{ return -ENXIO; }
		static inline int32_t qpnp_adc_qrd_skue_btm_scaler(struct qpnp_vadc_chip *dev,
		struct qpnp_adc_tm_btm_param *param,
		uint32_t low_threshold, uint32_t high_threshold)
		{ return -ENXIO; }
		static inline int32_t qpnp_adc_scale_millidegc_pmic_voltage_thr(
		struct qpnp_vadc_chip *dev,
		struct qpnp_adc_tm_btm_param *param,