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

Commit ceb32b3a 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: Update the prescaling ratio"

parents 797061c9 83eadf52

Documentation/devicetree/bindings/hwmon/qpnp-adc-voltage.txt

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ Required properties: 
				 2 : {1, 4}

				 3 : {1, 6}

				 4 : {1, 20}

				 5 : {1, 8}

- qcom,calibration-type : Reference voltage to use for channel calibration.

			  Channel calibration is dependendent on the channel.

			  Certain channels like XO_THERM, BATT_THERM use ratiometric

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ Required properties: 
				 2 : pre-div ratio of {1, 4}

				 3 : pre-div ratio of {1, 6}

				 4 : pre-div ratio of {1, 20}

				 5 : pre-div ratio of {1, 8}

- qcom,calibration-type : Reference voltage to use for channel calibration.

			  Channel calibration is dependendent on the channel.

			  Certain channels like XO_THERM, BATT_THERM use ratiometric

include/linux/qpnp/qpnp-adc.h

+5 −2
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
@@ -191,6 +191,7 @@ enum qpnp_adc_calib_type { 
 * %CHAN_PATH_SCALING2: ratio of {1, 4}

 * %CHAN_PATH_SCALING3: ratio of {1, 6}

 * %CHAN_PATH_SCALING4: ratio of {1, 20}

 * %CHAN_PATH_SCALING5: ratio of {1, 8}

 * %CHAN_PATH_NONE: Do not use this pre-scaling ratio type.

 *

 * The pre-scaling is applied for signals to be within the voltage range
@@ -202,6 +203,7 @@ enum qpnp_adc_channel_scaling_param { 
	PATH_SCALING2,

	PATH_SCALING3,

	PATH_SCALING4,

	PATH_SCALING5,

	PATH_SCALING_NONE,

};
@@ -900,7 +902,8 @@ static const struct qpnp_vadc_scaling_ratio qpnp_vadc_amux_scaling_ratio[] = { 
	{1, 3},

	{1, 4},

	{1, 6},

	{1, 20}

	{1, 20},

	{1, 8}

};



/**