Changes to support different VADC scaling

PATCH Superseded Rama Krishna Phani A 4 participants 7 messages Nov 24, 2016 – Dec 9, 2016 3 messages not in the archive

Subsystems (2)

Arm Qualcomm mailing list IIO

lore

Share & tools

lore

Rama Krishna Phani A

author

2016-11-24 05:31 UTC #0 lore raw

v5 cover Changes to support different VADC scaling

VADC is a 15 bit ADC that measures signals through the Main analog multiplexer (AMUX). The driver arbitrates the request to issue ADC read requests. These patches adds different scaling functionality to convert adc code to physical units.

[V5]
1. Retain new line as suggested.

[V4]
1. Remove DT bindings and implement scaling logic with in driver.

[V3]
1. Update the commit text to give more information on the functionality implemented in the patches.
2. Added Dt maintainers.

[V2]
1. Replaced the do_div with normal division.
2. Split the functionality implemented in v1 patch.
3. Abstracted out common logic and updated change to report Raw adc code properly.
4. Change to support different scaling functionality.
5. Added support for introducing new bindings in driver.

[V1]

	https://lkml.org/lkml/2016/10/25/26

Rama Krishna Phani A (2):
iio: adc: spmi-vadc: Update function for generic voltage conversion
iio: adc: spmi-vadc: Changes to support different scaling

 drivers/iio/adc/qcom-spmi-vadc.c | 479 ++++++++++++++++++++++++++++-----------
 1 file changed, 350 insertions(+), 129 deletions(-)

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

A message that is not in the archive (sent off-list or not yet received): 1479965465-30182-1-git-send-email-rphani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org

Rama Krishna Phani A

author

2016-11-24 05:31 UTC #2 lore raw

PATCH v5 1/2 iio: adc: spmi-vadc: Update function for generic voltage conversion

Several channels are supported in ADC of PMIC which can be used to measure voltage, temperature, current etc. Hardware provides readings for all channels in adc code. That adc code needs to be converted to voltage. Logic for conversion of adc code to voltage is common for all ADC channels(voltage, temperature, current etc). Implement separate function for generic conversion logic.

Signed-off-by Rama Krishna Phani A <[email protected]>

---
 drivers/iio/adc/qcom-spmi-vadc.c | 52 +++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

drivers/iio/adc/qcom-spmi-vadc.c +28 ~~-24~~

index c2babe5..93c0639 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016, 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

@@ -468,27 +468,38 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	return ret;
 }
 
-static s32 vadc_calibrate(struct vadc_priv *vadc,
-			  const struct vadc_channel_prop *prop, u16 adc_code)
+static void vadc_scale_calib(struct vadc_priv *vadc, u16 adc_code,
+			     const struct vadc_channel_prop *prop,
+			     s64 *scale_voltage)
 {
-	const struct vadc_prescale_ratio *prescale;
-	s64 voltage;
+	*scale_voltage = (adc_code -
+		vadc->graph[prop->calibration].gnd);
+	*scale_voltage *= vadc->graph[prop->calibration].dx;
+	*scale_voltage = div64_s64(*scale_voltage,
+		vadc->graph[prop->calibration].dy);
+	if (prop->calibration == VADC_CALIB_ABSOLUTE)
+		*scale_voltage +=
+		vadc->graph[prop->calibration].dx;
 
-	voltage = adc_code - vadc->graph[prop->calibration].gnd;
-	voltage *= vadc->graph[prop->calibration].dx;
-	voltage = div64_s64(voltage, vadc->graph[prop->calibration].dy);
+	if (*scale_voltage < 0)
+		*scale_voltage = 0;
+}
 
-	if (prop->calibration == VADC_CALIB_ABSOLUTE)
-		voltage += vadc->graph[prop->calibration].dx;
+static int vadc_scale_volt(struct vadc_priv *vadc,
+			   const struct vadc_channel_prop *prop, u16 adc_code,
+			   int *result_uv)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0, result = 0;
 
-	if (voltage < 0)
-		voltage = 0;
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
 
 	prescale = &vadc_prescale_ratios[prop->prescale];
-
 	voltage = voltage * prescale->den;
+	result = div64_s64(voltage, prescale->num);
+	*result_uv = result;
 
-	return div64_s64(voltage, prescale->num);
+	return 0;
 }
 
 static int vadc_decimation_from_dt(u32 value)

@@ -552,11 +563,8 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
 		if (ret)
 			break;
 
-		*val = vadc_calibrate(vadc, prop, adc_code);
+		vadc_scale_volt(vadc, prop, adc_code, val);
 
-		/* 2mV/K, return milli Celsius */
-		*val /= 2;
-		*val -= KELVINMIL_CELSIUSMIL;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_RAW:
 		prop = &vadc->chan_props[chan->address];

@@ -564,12 +572,8 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
 		if (ret)
 			break;
 
-		*val = vadc_calibrate(vadc, prop, adc_code);
+		*val = (int)adc_code;
 		return IIO_VAL_INT;
-	case IIO_CHAN_INFO_SCALE:
-		*val = 0;
-		*val2 = 1000;
-		return IIO_VAL_INT_PLUS_MICRO;
 	default:
 		ret = -EINVAL;
 		break;

@@ -617,7 +621,7 @@ struct vadc_channels {
 
 #define VADC_CHAN_VOLT(_dname, _pre)					\
 	VADC_CHAN(_dname, IIO_VOLTAGE,					\
-		  BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),	\
+		  BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),\
 		  _pre)							\
 
 /*

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Rama Krishna Phani A

2016-11-24 05:31 UTC #3 lore raw

PATCH v5 2/2 iio: adc: spmi-vadc: Changes to support different scaling

In reply to Rama Krishna Phani A

Several ADC channels are supported in PMIC which can be used to measure voltage, temperature, current etc. Different scaling can be applied on the obtained voltage to report in physical units. Scaling functionality can be different per channel. Add scaling support per channel. Every channel present in adc has an unique conversion formula for obtained voltage. Add support to report in Raw as well as in processed format. Scaling is applied when processed read is requested and is not applied when a Raw read is requested.

Signed-off-by Rama Krishna Phani A <[email protected]>

---
 drivers/iio/adc/qcom-spmi-vadc.c | 435 +++++++++++++++++++++++++++++----------
 1 file changed, 326 insertions(+), 109 deletions(-)

drivers/iio/adc/qcom-spmi-vadc.c +326 ~~-109~~

index 93c0639..a4e5405 100644
@@ -84,7 +84,7 @@
 #define VADC_MAX_ADC_CODE			0xa800
 
 #define VADC_ABSOLUTE_RANGE_UV			625000
-#define VADC_RATIOMETRIC_RANGE_UV		1800000
+#define VADC_RATIOMETRIC_RANGE			1800
 
 #define VADC_DEF_PRESCALING			0 /* 1:1 */
 #define VADC_DEF_DECIMATION			0 /* 512 */

@@ -100,9 +100,23 @@
 
 #define KELVINMIL_CELSIUSMIL			273150
 
+#define PMI_CHG_SCALE_1				-138890
+#define PMI_CHG_SCALE_2				391750000000
+
 #define VADC_CHAN_MIN			VADC_USBIN
 #define VADC_CHAN_MAX			VADC_LR_MUX3_BUF_PU1_PU2_XO_THERM
 
+/**
+ * struct vadc_map_pt - Map the graph representation for ADC channel
+ * @x: Represent the ADC digitized code.
+ * @y: Represent the physical data which can be temperature, voltage,
+ *     resistance.
+ */
+struct vadc_map_pt {
+	s32 x;
+	s32 y;
+};
+
 /*
  * VADC_CALIB_ABSOLUTE: uses the 625mV and 1.25V as reference channels.
  * VADC_CALIB_RATIOMETRIC: uses the reference voltage (1.8V) and GND for

@@ -148,6 +162,9 @@ struct vadc_prescale_ratio {
  *	start of conversion.
  * @avg_samples: ability to provide single result from the ADC
  *	that is an average of multiple measurements.
+ * @scale_fn: Represents the scaling function to convert voltage
+ *	physical units desired by the client for the channel.
+ *	Referenced from enum vadc_scale_fn_type.
  */
 struct vadc_channel_prop {
 	unsigned int channel;

@@ -156,6 +173,7 @@ struct vadc_channel_prop {
 	unsigned int prescale;
 	unsigned int hw_settle_time;
 	unsigned int avg_samples;
+	unsigned int scale_fn;
 };
 
 /**

@@ -186,6 +204,37 @@ struct vadc_priv {
 	struct mutex		 lock;
 };
 
+/**
+ * struct vadc_scale_fn - Scaling function prototype
+ * @scale: Function pointer to one of the scaling functions
+ *	which takes the adc properties, channel properties,
+ *	and returns the physical result.
+ */
+struct vadc_scale_fn {
+	int (*scale)(struct vadc_priv *, const struct vadc_channel_prop *,
+		     u16, int *);
+};
+
+/**
+ * enum vadc_scale_fn_type - Scaling function to convert ADC code to
+ *				physical scaled units for the channel.
+ * SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).
+ * SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.
+ *				 Uses a mapping table with 100K pullup.
+ * SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.
+ * SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.
+ * SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp
+ * SCALE_NONE: Do not use this scaling type.
+ */
+enum vadc_scale_fn_type {
+	SCALE_DEFAULT = 0,
+	SCALE_THERM_100K_PULLUP,
+	SCALE_PMIC_THERM,
+	SCALE_XOTHERM,
+	SCALE_PMI_CHG_TEMP,
+	SCALE_NONE,
+};
+
 static const struct vadc_prescale_ratio vadc_prescale_ratios[] = {
 	{.num =  1, .den =  1},
 	{.num =  1, .den =  3},

@@ -197,6 +246,44 @@ struct vadc_priv {
 	{.num =  1, .den = 10}
 };
 
+/* Voltage to temperature */
+static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
+	{1758,	-40},
+	{1742,	-35},
+	{1719,	-30},
+	{1691,	-25},
+	{1654,	-20},
+	{1608,	-15},
+	{1551,	-10},
+	{1483,	-5},
+	{1404,	0},
+	{1315,	5},
+	{1218,	10},
+	{1114,	15},
+	{1007,	20},
+	{900,	25},
+	{795,	30},
+	{696,	35},
+	{605,	40},
+	{522,	45},
+	{448,	50},
+	{383,	55},
+	{327,	60},
+	{278,	65},
+	{237,	70},
+	{202,	75},
+	{172,	80},
+	{146,	85},
+	{125,	90},
+	{107,	95},
+	{92,	100},
+	{79,	105},
+	{68,	110},
+	{59,	115},
+	{51,	120},
+	{44,	125}
+};
+
 static int vadc_read(struct vadc_priv *vadc, u16 offset, u8 *data)
 {
 	return regmap_bulk_read(vadc->regmap, vadc->base + offset, data, 1);

@@ -418,7 +505,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	u16 read_1, read_2;
 	int ret;
 
-	vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE_UV;
+	vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE;
 	vadc->graph[VADC_CALIB_ABSOLUTE].dx = VADC_ABSOLUTE_RANGE_UV;
 
 	prop = vadc_get_channel(vadc, VADC_REF_1250MV);

@@ -468,6 +555,51 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	return ret;
 }
 
+static int vadc_map_voltage_temp(const struct vadc_map_pt *pts,
+				 u32 tablesize, s32 input, s64 *output)
+{
+	bool descending = 1;
+	u32 i = 0;
+
+	if (!pts)
+		return -EINVAL;
+
+	/* Check if table is descending or ascending */
+	if (tablesize > 1) {
+		if (pts[0].x < pts[1].x)
+			descending = 0;
+	}
+
+	while (i < tablesize) {
+		if ((descending) && (pts[i].x < input)) {
+			/* table entry is less than measured*/
+			 /* value and table is descending, stop */
+			break;
+		} else if ((!descending) &&
+				(pts[i].x > input)) {
+			/* table entry is greater than measured*/
+			/*value and table is ascending, stop */
+			break;
+		}
+		i++;
+	}
+
+	if (i == 0) {
+		*output = pts[0].y;
+	} else if (i == tablesize) {
+		*output = pts[tablesize - 1].y;
+	} else {
+		/* result is between search_index and search_index-1 */
+		/* interpolate linearly */
+		*output = (((s32)((pts[i].y - pts[i - 1].y) *
+			(input - pts[i - 1].x)) /
+			(pts[i].x - pts[i - 1].x)) +
+			pts[i - 1].y);
+	}
+
+	return 0;
+}
+
 static void vadc_scale_calib(struct vadc_priv *vadc, u16 adc_code,
 			     const struct vadc_channel_prop *prop,
 			     s64 *scale_voltage)

@@ -502,6 +634,77 @@ static int vadc_scale_volt(struct vadc_priv *vadc,
 	return 0;
 }
 
+static int vadc_scale_therm(struct vadc_priv *vadc,
+			    const struct vadc_channel_prop *prop, u16 adc_code,
+			    int *result_mdec)
+{
+	s64 voltage = 0, result = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	if (prop->calibration == VADC_CALIB_ABSOLUTE)
+		voltage /= 1000;
+
+	vadc_map_voltage_temp(adcmap_100k_104ef_104fb,
+			      ARRAY_SIZE(adcmap_100k_104ef_104fb),
+			      voltage, &result);
+	result *= 1000;
+	*result_mdec = result;
+
+	return 0;
+}
+
+static int vadc_scale_die_temp(struct vadc_priv *vadc,
+			       const struct vadc_channel_prop *prop,
+			       u16 adc_code, int *result_mdec)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	if (voltage > 0) {
+		prescale = &vadc_prescale_ratios[prop->prescale];
+		voltage = voltage * prescale->den;
+		voltage /= (prescale->num * 2);
+	} else {
+		voltage = 0;
+	}
+
+	voltage -= KELVINMIL_CELSIUSMIL;
+	*result_mdec = voltage;
+
+	return 0;
+}
+
+static int vadc_scale_chg_temp(struct vadc_priv *vadc,
+			       const struct vadc_channel_prop *prop,
+			       u16 adc_code, int *result_mdec)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0, result = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	prescale = &vadc_prescale_ratios[prop->prescale];
+	voltage = voltage * prescale->den;
+	voltage = div64_s64(voltage, prescale->num);
+	voltage = ((PMI_CHG_SCALE_1) * (voltage * 2));
+	voltage = (voltage + PMI_CHG_SCALE_2);
+	result =  div64_s64(voltage, 1000000);
+	*result_mdec = result;
+
+	return 0;
+}
+
+static int vadc_scale(struct vadc_priv *vadc,
+		      const struct vadc_channel_prop *prop, u16 adc_code,
+		      int *scale)
+{
+	dev_err(vadc->dev, "Need a scale function\n");
+	return 0;
+}
+
 static int vadc_decimation_from_dt(u32 value)
 {
 	if (!is_power_of_2(value) || value < VADC_DECIMATION_MIN ||

@@ -547,6 +750,15 @@ static int vadc_avg_samples_from_dt(u32 value)
 	return __ffs64(value);
 }
 
+static struct vadc_scale_fn scale_fn[] = {
+	[SCALE_DEFAULT] = {vadc_scale_volt},
+	[SCALE_THERM_100K_PULLUP] = {vadc_scale_therm},
+	[SCALE_PMIC_THERM] = {vadc_scale_die_temp},
+	[SCALE_XOTHERM] = {vadc_scale_therm},
+	[SCALE_PMI_CHG_TEMP] = {vadc_scale_chg_temp},
+	[SCALE_NONE] = {vadc_scale},
+};
+
 static int vadc_read_raw(struct iio_dev *indio_dev,
 			 struct iio_chan_spec const *chan, int *val, int *val2,
 			 long mask)

@@ -563,7 +775,7 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
 		if (ret)
 			break;
 
-		vadc_scale_volt(vadc, prop, adc_code, val);
+		scale_fn[prop->scale_fn].scale(vadc, prop, adc_code, val);
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_RAW:

@@ -606,23 +818,27 @@ struct vadc_channels {
 	unsigned int prescale_index;
 	enum iio_chan_type type;
 	long info_mask;
+	unsigned int scale_fn;
 };
 
-#define VADC_CHAN(_dname, _type, _mask, _pre)				\
+#define VADC_CHAN(_dname, _type, _mask, _pre, _scale)			\
 	[VADC_##_dname] = {						\
 		.datasheet_name = __stringify(_dname),			\
 		.prescale_index = _pre,					\
 		.type = _type,						\
-		.info_mask = _mask					\
+		.info_mask = _mask,					\
+		.scale_fn = _scale					\
 	},								\
 
-#define VADC_CHAN_TEMP(_dname, _pre)					\
-	VADC_CHAN(_dname, IIO_TEMP, BIT(IIO_CHAN_INFO_PROCESSED), _pre)	\
+#define VADC_CHAN_TEMP(_dname, _pre, _scale)				\
+	VADC_CHAN(_dname, IIO_TEMP,					\
+		BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),	\
+		_pre, _scale)						\
 
-#define VADC_CHAN_VOLT(_dname, _pre)					\
+#define VADC_CHAN_VOLT(_dname, _pre, _scale)				\
 	VADC_CHAN(_dname, IIO_VOLTAGE,					\
 		  BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),\
-		  _pre)							\
+		  _pre, _scale)						\
 
 /*
  * The array represents all possible ADC channels found in the supported PMICs.

@@ -630,106 +846,106 @@ struct vadc_channels {
  * gaps in the array should be treated as reserved channels.
  */
 static const struct vadc_channels vadc_chans[] = {
-	VADC_CHAN_VOLT(USBIN, 4)
-	VADC_CHAN_VOLT(DCIN, 4)
-	VADC_CHAN_VOLT(VCHG_SNS, 3)
-	VADC_CHAN_VOLT(SPARE1_03, 1)
-	VADC_CHAN_VOLT(USB_ID_MV, 1)
-	VADC_CHAN_VOLT(VCOIN, 1)
-	VADC_CHAN_VOLT(VBAT_SNS, 1)
-	VADC_CHAN_VOLT(VSYS, 1)
-	VADC_CHAN_TEMP(DIE_TEMP, 0)
-	VADC_CHAN_VOLT(REF_625MV, 0)
-	VADC_CHAN_VOLT(REF_1250MV, 0)
-	VADC_CHAN_VOLT(CHG_TEMP, 0)
-	VADC_CHAN_VOLT(SPARE1, 0)
-	VADC_CHAN_VOLT(SPARE2, 0)
-	VADC_CHAN_VOLT(GND_REF, 0)
-	VADC_CHAN_VOLT(VDD_VADC, 0)
-
-	VADC_CHAN_VOLT(P_MUX1_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX2_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX3_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX4_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX5_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX6_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX7_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX8_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX9_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX10_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX11_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX12_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX13_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX14_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX15_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX16_1_1, 0)
-
-	VADC_CHAN_VOLT(P_MUX1_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX2_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX3_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX4_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX5_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX6_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX7_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX8_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX9_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX10_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX11_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX12_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX13_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX14_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX15_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX16_1_3, 1)
-
-	VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0)
-	VADC_CHAN_VOLT(AMUX_PU1, 0)
-	VADC_CHAN_VOLT(AMUX_PU2, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU1_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU1_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU1_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU1_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU1_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU1_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU1_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU2_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU2_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU2_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU2_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU2_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU2_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU2_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU2_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU1_PU2_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU1_PU2_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU1_PU2_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU1_PU2_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU1_PU2_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU1_PU2_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU1_PU2_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0)
+	VADC_CHAN_VOLT(USBIN, 4, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(DCIN, 4, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VCHG_SNS, 3, SCALE_NONE)
+	VADC_CHAN_VOLT(SPARE1_03, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(USB_ID_MV, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(VCOIN, 1, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VBAT_SNS, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(VSYS, 1, SCALE_DEFAULT)
+	VADC_CHAN_TEMP(DIE_TEMP, 0, SCALE_PMIC_THERM)
+	VADC_CHAN_VOLT(REF_625MV, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(REF_1250MV, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(CHG_TEMP, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(SPARE1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(SPARE2, 0, SCALE_PMI_CHG_TEMP)
+	VADC_CHAN_VOLT(GND_REF, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VDD_VADC, 0, SCALE_DEFAULT)
+
+	VADC_CHAN_VOLT(P_MUX1_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX2_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX3_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX4_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX5_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX6_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX7_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX8_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX9_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX10_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX11_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX12_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX13_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX14_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX15_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX16_1_1, 0, SCALE_NONE)
+
+	VADC_CHAN_VOLT(P_MUX1_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX2_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX3_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX4_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX5_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX6_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX7_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX8_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX9_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX10_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX11_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX12_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX13_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX14_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX15_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX16_1_3, 1, SCALE_NONE)
+
+	VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(AMUX_PU1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(AMUX_PU2, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0, SCALE_NONE)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU1_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU1_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU1_AMUX_THM1, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX5_PU1_AMUX_THM2, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX6_PU1_AMUX_THM3, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU1_AMUX_THM4, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX9_PU1_AMUX_THM5, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_XO_THERM, 0, SCALE_XOTHERM)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU2_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU2_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU2_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX5_PU2_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX6_PU2_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU2_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX9_PU2_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU2_XO_THERM, 0, SCALE_NONE)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU1_PU2_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU1_PU2_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU1_PU2_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX5_PU1_PU2_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX6_PU1_PU2_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU1_PU2_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX9_PU1_PU2_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0, SCALE_NONE)
 };
 
 static int vadc_get_dt_channel_data(struct device *dev,

@@ -848,6 +1064,7 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
 			return ret;
 		}
 
+		prop.scale_fn = vadc_chans[prop.channel].scale_fn;
 		vadc->chan_props[index] = prop;
 
 		vadc_chan = &vadc_chans[prop.channel];

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

A message that is not in the archive (sent off-list or not yet received): 1479965465-30182-3-git-send-email-rphani-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org

Jonathan Cameron

2016-11-27 15:48 UTC #5 lore raw

Re: [PATCH V5 2/2] iio: adc: spmi-vadc: Changes to support different scaling

Quoted 10 lines · Rama Krishna Phani A

Several ADC channels are supported in PMIC which can be used to measure voltage, temperature, current etc. Different scaling can be applied on the obtained voltage to report in physical units. Scaling functionality can be different per channel. Add scaling support per channel. Every channel present in adc has an unique conversion formula for obtained voltage. Add support to report in Raw as well as in processed format. Scaling is applied when processed read is requested and is not applied when a Raw read is requested.
Signed-off-by Rama Krishna Phani A <[email protected]>

I obviously didn't make it clear enough in last review.

If you can't return a value in response to reading a sysfs attribute, the attribute should not exist. See below for a suggestion on this.

Jonathan

Quoted 327 lines

---
 drivers/iio/adc/qcom-spmi-vadc.c | 435 +++++++++++++++++++++++++++++----------
 1 file changed, 326 insertions(+), 109 deletions(-)

drivers/iio/adc/qcom-spmi-vadc.c +220 -7

index 93c0639..a4e5405 100644
@@ -84,7 +84,7 @@
 #define VADC_MAX_ADC_CODE			0xa800
 
 #define VADC_ABSOLUTE_RANGE_UV			625000
-#define VADC_RATIOMETRIC_RANGE_UV		1800000
+#define VADC_RATIOMETRIC_RANGE			1800
 
 #define VADC_DEF_PRESCALING			0 /* 1:1 */
 #define VADC_DEF_DECIMATION			0 /* 512 */

@@ -100,9 +100,23 @@
 
 #define KELVINMIL_CELSIUSMIL			273150
 
+#define PMI_CHG_SCALE_1				-138890
+#define PMI_CHG_SCALE_2				391750000000
+
 #define VADC_CHAN_MIN			VADC_USBIN
 #define VADC_CHAN_MAX			VADC_LR_MUX3_BUF_PU1_PU2_XO_THERM
 
+/**
+ * struct vadc_map_pt - Map the graph representation for ADC channel
+ * @x: Represent the ADC digitized code.
+ * @y: Represent the physical data which can be temperature, voltage,
+ *     resistance.
+ */
+struct vadc_map_pt {
+	s32 x;
+	s32 y;
+};
+
 /*
  * VADC_CALIB_ABSOLUTE: uses the 625mV and 1.25V as reference channels.
  * VADC_CALIB_RATIOMETRIC: uses the reference voltage (1.8V) and GND for

@@ -148,6 +162,9 @@ struct vadc_prescale_ratio {
  *	start of conversion.
  * @avg_samples: ability to provide single result from the ADC
  *	that is an average of multiple measurements.
+ * @scale_fn: Represents the scaling function to convert voltage
+ *	physical units desired by the client for the channel.
+ *	Referenced from enum vadc_scale_fn_type.
  */
 struct vadc_channel_prop {
 	unsigned int channel;

@@ -156,6 +173,7 @@ struct vadc_channel_prop {
 	unsigned int prescale;
 	unsigned int hw_settle_time;
 	unsigned int avg_samples;
+	unsigned int scale_fn;
 };
 
 /**

@@ -186,6 +204,37 @@ struct vadc_priv {
 	struct mutex		 lock;
 };
 
+/**
+ * struct vadc_scale_fn - Scaling function prototype
+ * @scale: Function pointer to one of the scaling functions
+ *	which takes the adc properties, channel properties,
+ *	and returns the physical result.
+ */
+struct vadc_scale_fn {
+	int (*scale)(struct vadc_priv *, const struct vadc_channel_prop *,
+		     u16, int *);
+};
+
+/**
+ * enum vadc_scale_fn_type - Scaling function to convert ADC code to
+ *				physical scaled units for the channel.
+ * SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).
+ * SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.
+ *				 Uses a mapping table with 100K pullup.
+ * SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.
+ * SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.
+ * SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp
+ * SCALE_NONE: Do not use this scaling type.
+ */
+enum vadc_scale_fn_type {
+	SCALE_DEFAULT = 0,
+	SCALE_THERM_100K_PULLUP,
+	SCALE_PMIC_THERM,
+	SCALE_XOTHERM,
+	SCALE_PMI_CHG_TEMP,
+	SCALE_NONE,
+};
+
 static const struct vadc_prescale_ratio vadc_prescale_ratios[] = {
 	{.num =  1, .den =  1},
 	{.num =  1, .den =  3},

@@ -197,6 +246,44 @@ struct vadc_priv {
 	{.num =  1, .den = 10}
 };
 
+/* Voltage to temperature */
+static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
+	{1758,	-40},
+	{1742,	-35},
+	{1719,	-30},
+	{1691,	-25},
+	{1654,	-20},
+	{1608,	-15},
+	{1551,	-10},
+	{1483,	-5},
+	{1404,	0},
+	{1315,	5},
+	{1218,	10},
+	{1114,	15},
+	{1007,	20},
+	{900,	25},
+	{795,	30},
+	{696,	35},
+	{605,	40},
+	{522,	45},
+	{448,	50},
+	{383,	55},
+	{327,	60},
+	{278,	65},
+	{237,	70},
+	{202,	75},
+	{172,	80},
+	{146,	85},
+	{125,	90},
+	{107,	95},
+	{92,	100},
+	{79,	105},
+	{68,	110},
+	{59,	115},
+	{51,	120},
+	{44,	125}
+};
+
 static int vadc_read(struct vadc_priv *vadc, u16 offset, u8 *data)
 {
 	return regmap_bulk_read(vadc->regmap, vadc->base + offset, data, 1);

@@ -418,7 +505,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	u16 read_1, read_2;
 	int ret;
 
-	vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE_UV;
+	vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE;
 	vadc->graph[VADC_CALIB_ABSOLUTE].dx = VADC_ABSOLUTE_RANGE_UV;
 
 	prop = vadc_get_channel(vadc, VADC_REF_1250MV);

@@ -468,6 +555,51 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	return ret;
 }
 
+static int vadc_map_voltage_temp(const struct vadc_map_pt *pts,
+				 u32 tablesize, s32 input, s64 *output)
+{
+	bool descending = 1;
+	u32 i = 0;
+
+	if (!pts)
+		return -EINVAL;
+
+	/* Check if table is descending or ascending */
+	if (tablesize > 1) {
+		if (pts[0].x < pts[1].x)
+			descending = 0;
+	}
+
+	while (i < tablesize) {
+		if ((descending) && (pts[i].x < input)) {
+			/* table entry is less than measured*/
+			 /* value and table is descending, stop */
+			break;
+		} else if ((!descending) &&
+				(pts[i].x > input)) {
+			/* table entry is greater than measured*/
+			/*value and table is ascending, stop */
+			break;
+		}
+		i++;
+	}
+
+	if (i == 0) {
+		*output = pts[0].y;
+	} else if (i == tablesize) {
+		*output = pts[tablesize - 1].y;
+	} else {
+		/* result is between search_index and search_index-1 */
+		/* interpolate linearly */
+		*output = (((s32)((pts[i].y - pts[i - 1].y) *
+			(input - pts[i - 1].x)) /
+			(pts[i].x - pts[i - 1].x)) +
+			pts[i - 1].y);
+	}
+
+	return 0;
+}
+
 static void vadc_scale_calib(struct vadc_priv *vadc, u16 adc_code,
 			     const struct vadc_channel_prop *prop,
 			     s64 *scale_voltage)

@@ -502,6 +634,77 @@ static int vadc_scale_volt(struct vadc_priv *vadc,
 	return 0;
 }
 
+static int vadc_scale_therm(struct vadc_priv *vadc,
+			    const struct vadc_channel_prop *prop, u16 adc_code,
+			    int *result_mdec)
+{
+	s64 voltage = 0, result = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	if (prop->calibration == VADC_CALIB_ABSOLUTE)
+		voltage /= 1000;
+
+	vadc_map_voltage_temp(adcmap_100k_104ef_104fb,
+			      ARRAY_SIZE(adcmap_100k_104ef_104fb),
+			      voltage, &result);
+	result *= 1000;
+	*result_mdec = result;
+
+	return 0;
+}
+
+static int vadc_scale_die_temp(struct vadc_priv *vadc,
+			       const struct vadc_channel_prop *prop,
+			       u16 adc_code, int *result_mdec)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	if (voltage > 0) {
+		prescale = &vadc_prescale_ratios[prop->prescale];
+		voltage = voltage * prescale->den;
+		voltage /= (prescale->num * 2);
+	} else {
+		voltage = 0;
+	}
+
+	voltage -= KELVINMIL_CELSIUSMIL;
+	*result_mdec = voltage;
+
+	return 0;
+}
+
+static int vadc_scale_chg_temp(struct vadc_priv *vadc,
+			       const struct vadc_channel_prop *prop,
+			       u16 adc_code, int *result_mdec)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0, result = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	prescale = &vadc_prescale_ratios[prop->prescale];
+	voltage = voltage * prescale->den;
+	voltage = div64_s64(voltage, prescale->num);
+	voltage = ((PMI_CHG_SCALE_1) * (voltage * 2));
+	voltage = (voltage + PMI_CHG_SCALE_2);
+	result =  div64_s64(voltage, 1000000);
+	*result_mdec = result;
+
+	return 0;
+}
+
+static int vadc_scale(struct vadc_priv *vadc,
+		      const struct vadc_channel_prop *prop, u16 adc_code,
+		      int *scale)
+{
+	dev_err(vadc->dev, "Need a scale function\n");
+	return 0;
+}
+
 static int vadc_decimation_from_dt(u32 value)
 {
 	if (!is_power_of_2(value) || value < VADC_DECIMATION_MIN ||

@@ -547,6 +750,15 @@ static int vadc_avg_samples_from_dt(u32 value)
 	return __ffs64(value);
 }
 
+static struct vadc_scale_fn scale_fn[] = {
+	[SCALE_DEFAULT] = {vadc_scale_volt},
+	[SCALE_THERM_100K_PULLUP] = {vadc_scale_therm},
+	[SCALE_PMIC_THERM] = {vadc_scale_die_temp},
+	[SCALE_XOTHERM] = {vadc_scale_therm},
+	[SCALE_PMI_CHG_TEMP] = {vadc_scale_chg_temp},
+	[SCALE_NONE] = {vadc_scale},
+};
+
 static int vadc_read_raw(struct iio_dev *indio_dev,
 			 struct iio_chan_spec const *chan, int *val, int *val2,
 			 long mask)

@@ -563,7 +775,7 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
 		if (ret)
 			break;
 
-		vadc_scale_volt(vadc, prop, adc_code, val);
+		scale_fn[prop->scale_fn].scale(vadc, prop, adc_code, val);
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_RAW:

@@ -606,23 +818,27 @@ struct vadc_channels {
 	unsigned int prescale_index;
 	enum iio_chan_type type;
 	long info_mask;
+	unsigned int scale_fn;
 };
 
-#define VADC_CHAN(_dname, _type, _mask, _pre)				\
+#define VADC_CHAN(_dname, _type, _mask, _pre, _scale)			\
 	[VADC_##_dname] = {						\
 		.datasheet_name = __stringify(_dname),			\
 		.prescale_index = _pre,					\
 		.type = _type,						\
-		.info_mask = _mask					\
+		.info_mask = _mask,					\
+		.scale_fn = _scale					\
 	},								\
 
-#define VADC_CHAN_TEMP(_dname, _pre)					\
-	VADC_CHAN(_dname, IIO_TEMP, BIT(IIO_CHAN_INFO_PROCESSED), _pre)	\
+#define VADC_CHAN_TEMP(_dname, _pre, _scale)				\

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 841

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +5 -2

+	VADC_CHAN(_dname, IIO_TEMP,					\
+		BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),	\
+		_pre, _scale)						\
 
-#define VADC_CHAN_VOLT(_dname, _pre)					\
+#define VADC_CHAN_VOLT(_dname, _pre, _scale)				\
 	VADC_CHAN(_dname, IIO_VOLTAGE,					\
 		  BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),\
-		  _pre)							\
+		  _pre, _scale)						\

In the SCALE_NONE case you are still creating the sysfs attributes to provide processed. Just have a variant of this macro that doesn't do this.

That way we don't end up with a sysfs attribute that always results in an error!

#define VADC_CHAN_VOLT_NO_KNOWN_SCALEE(_dname, _pre) \
	VADC_CHAN(_dname, IIO_VOLTAGE, BIT(IIO_CHAN_INFO_RAW), _pre);

Quoted 82 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-75~~

 /*
  * The array represents all possible ADC channels found in the supported PMICs.

@@ -630,106 +846,106 @@ struct vadc_channels {
  * gaps in the array should be treated as reserved channels.
  */
 static const struct vadc_channels vadc_chans[] = {
-	VADC_CHAN_VOLT(USBIN, 4)
-	VADC_CHAN_VOLT(DCIN, 4)
-	VADC_CHAN_VOLT(VCHG_SNS, 3)
-	VADC_CHAN_VOLT(SPARE1_03, 1)
-	VADC_CHAN_VOLT(USB_ID_MV, 1)
-	VADC_CHAN_VOLT(VCOIN, 1)
-	VADC_CHAN_VOLT(VBAT_SNS, 1)
-	VADC_CHAN_VOLT(VSYS, 1)
-	VADC_CHAN_TEMP(DIE_TEMP, 0)
-	VADC_CHAN_VOLT(REF_625MV, 0)
-	VADC_CHAN_VOLT(REF_1250MV, 0)
-	VADC_CHAN_VOLT(CHG_TEMP, 0)
-	VADC_CHAN_VOLT(SPARE1, 0)
-	VADC_CHAN_VOLT(SPARE2, 0)
-	VADC_CHAN_VOLT(GND_REF, 0)
-	VADC_CHAN_VOLT(VDD_VADC, 0)
-
-	VADC_CHAN_VOLT(P_MUX1_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX2_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX3_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX4_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX5_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX6_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX7_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX8_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX9_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX10_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX11_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX12_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX13_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX14_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX15_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX16_1_1, 0)
-
-	VADC_CHAN_VOLT(P_MUX1_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX2_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX3_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX4_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX5_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX6_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX7_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX8_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX9_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX10_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX11_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX12_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX13_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX14_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX15_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX16_1_3, 1)
-
-	VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0)
-	VADC_CHAN_VOLT(AMUX_PU1, 0)
-	VADC_CHAN_VOLT(AMUX_PU2, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU1_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU1_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU1_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU1_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU1_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU1_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU1_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0)

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 717

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-10~~

-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU2_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU2_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU2_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU2_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU2_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU2_AMUX_THM4, 0)

- VADC_CHAN_VOLT(LR_MUX9_PU2_AMUX_THM5, 0)

Quoted 126 lines

drivers/iio/adc/qcom-spmi-vadc.c +101 ~~-14~~

-	VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU2_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU1_PU2_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU1_PU2_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU1_PU2_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU1_PU2_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU1_PU2_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU1_PU2_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU1_PU2_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0)
+	VADC_CHAN_VOLT(USBIN, 4, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(DCIN, 4, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VCHG_SNS, 3, SCALE_NONE)
+	VADC_CHAN_VOLT(SPARE1_03, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(USB_ID_MV, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(VCOIN, 1, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VBAT_SNS, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(VSYS, 1, SCALE_DEFAULT)
+	VADC_CHAN_TEMP(DIE_TEMP, 0, SCALE_PMIC_THERM)
+	VADC_CHAN_VOLT(REF_625MV, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(REF_1250MV, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(CHG_TEMP, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(SPARE1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(SPARE2, 0, SCALE_PMI_CHG_TEMP)
+	VADC_CHAN_VOLT(GND_REF, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VDD_VADC, 0, SCALE_DEFAULT)
+
+	VADC_CHAN_VOLT(P_MUX1_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX2_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX3_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX4_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX5_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX6_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX7_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX8_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX9_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX10_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX11_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX12_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX13_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX14_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX15_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX16_1_1, 0, SCALE_NONE)
+
+	VADC_CHAN_VOLT(P_MUX1_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX2_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX3_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX4_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX5_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX6_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX7_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX8_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX9_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX10_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX11_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX12_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX13_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX14_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX15_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX16_1_3, 1, SCALE_NONE)
+
+	VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(AMUX_PU1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(AMUX_PU2, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0, SCALE_NONE)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU1_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU1_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU1_AMUX_THM1, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX5_PU1_AMUX_THM2, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX6_PU1_AMUX_THM3, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU1_AMUX_THM4, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX9_PU1_AMUX_THM5, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_XO_THERM, 0, SCALE_XOTHERM)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU2_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU2_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU2_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX5_PU2_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX6_PU2_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU2_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX9_PU2_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU2_XO_THERM, 0, SCALE_NONE)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU1_PU2_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU1_PU2_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU1_PU2_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX5_PU1_PU2_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX6_PU1_PU2_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU1_PU2_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX9_PU1_PU2_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0, SCALE_NONE)
 };
 
 static int vadc_get_dt_channel_data(struct device *dev,

@@ -848,6 +1064,7 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
 			return ret;
 		}
 
+		prop.scale_fn = vadc_chans[prop.channel].scale_fn;
 		vadc->chan_props[index] = prop;
 
 		vadc_chan = &vadc_chans[prop.channel];

Phani A, Rama Krishna

2016-11-30 12:13 UTC #6 lore raw

Re: [PATCH V5 2/2] iio: adc: spmi-vadc: Changes to support different scaling

Hi Jonathan,

Quoted 10 lines · Jonathan Cameron

Quoted 9 lines · Rama Krishna Phani A
Several ADC channels are supported in PMIC which can be used to measure voltage, temperature, current etc. Different scaling can be applied on the obtained voltage to report in physical units. Scaling functionality can be different per channel. Add scaling support per channel. Every channel present in adc has an unique conversion formula for obtained voltage. Add support to report in Raw as well as in processed format. Scaling is applied when processed read is requested and is not applied when a Raw read is requested.

Quoted 5 lines

Quoted 1 line
Signed-off-by Rama Krishna Phani A <[email protected]>
I obviously didn't make it clear enough in last review.
If you can't return a value in response to reading a sysfs attribute, the attribute should not exist. See below for a suggestion on this.

Agree., Even here we never expose a channel in sysfs if we dont know the response. Channels in sysfs are populated based on list available from DT. Provided more explanation below.

Quoted 342 lines

Jonathan

Quoted 327 lines

---
 drivers/iio/adc/qcom-spmi-vadc.c | 435 +++++++++++++++++++++++++++++----------
 1 file changed, 326 insertions(+), 109 deletions(-)

drivers/iio/adc/qcom-spmi-vadc.c +220 -7

index 93c0639..a4e5405 100644
@@ -84,7 +84,7 @@
 #define VADC_MAX_ADC_CODE			0xa800
 
 #define VADC_ABSOLUTE_RANGE_UV			625000
-#define VADC_RATIOMETRIC_RANGE_UV		1800000
+#define VADC_RATIOMETRIC_RANGE			1800
 
 #define VADC_DEF_PRESCALING			0 /* 1:1 */
 #define VADC_DEF_DECIMATION			0 /* 512 */

@@ -100,9 +100,23 @@
 
 #define KELVINMIL_CELSIUSMIL			273150
 
+#define PMI_CHG_SCALE_1				-138890
+#define PMI_CHG_SCALE_2				391750000000
+
 #define VADC_CHAN_MIN			VADC_USBIN
 #define VADC_CHAN_MAX			VADC_LR_MUX3_BUF_PU1_PU2_XO_THERM
 
+/**
+ * struct vadc_map_pt - Map the graph representation for ADC channel
+ * @x: Represent the ADC digitized code.
+ * @y: Represent the physical data which can be temperature, voltage,
+ *     resistance.
+ */
+struct vadc_map_pt {
+	s32 x;
+	s32 y;
+};
+
 /*
  * VADC_CALIB_ABSOLUTE: uses the 625mV and 1.25V as reference channels.
  * VADC_CALIB_RATIOMETRIC: uses the reference voltage (1.8V) and GND for

@@ -148,6 +162,9 @@ struct vadc_prescale_ratio {
  *	start of conversion.
  * @avg_samples: ability to provide single result from the ADC
  *	that is an average of multiple measurements.
+ * @scale_fn: Represents the scaling function to convert voltage
+ *	physical units desired by the client for the channel.
+ *	Referenced from enum vadc_scale_fn_type.
  */
 struct vadc_channel_prop {
 	unsigned int channel;

@@ -156,6 +173,7 @@ struct vadc_channel_prop {
 	unsigned int prescale;
 	unsigned int hw_settle_time;
 	unsigned int avg_samples;
+	unsigned int scale_fn;
 };
 
 /**

@@ -186,6 +204,37 @@ struct vadc_priv {
 	struct mutex		 lock;
 };
 
+/**
+ * struct vadc_scale_fn - Scaling function prototype
+ * @scale: Function pointer to one of the scaling functions
+ *	which takes the adc properties, channel properties,
+ *	and returns the physical result.
+ */
+struct vadc_scale_fn {
+	int (*scale)(struct vadc_priv *, const struct vadc_channel_prop *,
+		     u16, int *);
+};
+
+/**
+ * enum vadc_scale_fn_type - Scaling function to convert ADC code to
+ *				physical scaled units for the channel.
+ * SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).
+ * SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.
+ *				 Uses a mapping table with 100K pullup.
+ * SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.
+ * SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.
+ * SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp
+ * SCALE_NONE: Do not use this scaling type.
+ */
+enum vadc_scale_fn_type {
+	SCALE_DEFAULT = 0,
+	SCALE_THERM_100K_PULLUP,
+	SCALE_PMIC_THERM,
+	SCALE_XOTHERM,
+	SCALE_PMI_CHG_TEMP,
+	SCALE_NONE,
+};
+
 static const struct vadc_prescale_ratio vadc_prescale_ratios[] = {
 	{.num =  1, .den =  1},
 	{.num =  1, .den =  3},

@@ -197,6 +246,44 @@ struct vadc_priv {
 	{.num =  1, .den = 10}
 };
 
+/* Voltage to temperature */
+static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
+	{1758,	-40},
+	{1742,	-35},
+	{1719,	-30},
+	{1691,	-25},
+	{1654,	-20},
+	{1608,	-15},
+	{1551,	-10},
+	{1483,	-5},
+	{1404,	0},
+	{1315,	5},
+	{1218,	10},
+	{1114,	15},
+	{1007,	20},
+	{900,	25},
+	{795,	30},
+	{696,	35},
+	{605,	40},
+	{522,	45},
+	{448,	50},
+	{383,	55},
+	{327,	60},
+	{278,	65},
+	{237,	70},
+	{202,	75},
+	{172,	80},
+	{146,	85},
+	{125,	90},
+	{107,	95},
+	{92,	100},
+	{79,	105},
+	{68,	110},
+	{59,	115},
+	{51,	120},
+	{44,	125}
+};
+
 static int vadc_read(struct vadc_priv *vadc, u16 offset, u8 *data)
 {
 	return regmap_bulk_read(vadc->regmap, vadc->base + offset, data, 1);

@@ -418,7 +505,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	u16 read_1, read_2;
 	int ret;
 
-	vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE_UV;
+	vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE;
 	vadc->graph[VADC_CALIB_ABSOLUTE].dx = VADC_ABSOLUTE_RANGE_UV;
 
 	prop = vadc_get_channel(vadc, VADC_REF_1250MV);

@@ -468,6 +555,51 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
 	return ret;
 }
 
+static int vadc_map_voltage_temp(const struct vadc_map_pt *pts,
+				 u32 tablesize, s32 input, s64 *output)
+{
+	bool descending = 1;
+	u32 i = 0;
+
+	if (!pts)
+		return -EINVAL;
+
+	/* Check if table is descending or ascending */
+	if (tablesize > 1) {
+		if (pts[0].x < pts[1].x)
+			descending = 0;
+	}
+
+	while (i < tablesize) {
+		if ((descending) && (pts[i].x < input)) {
+			/* table entry is less than measured*/
+			 /* value and table is descending, stop */
+			break;
+		} else if ((!descending) &&
+				(pts[i].x > input)) {
+			/* table entry is greater than measured*/
+			/*value and table is ascending, stop */
+			break;
+		}
+		i++;
+	}
+
+	if (i == 0) {
+		*output = pts[0].y;
+	} else if (i == tablesize) {
+		*output = pts[tablesize - 1].y;
+	} else {
+		/* result is between search_index and search_index-1 */
+		/* interpolate linearly */
+		*output = (((s32)((pts[i].y - pts[i - 1].y) *
+			(input - pts[i - 1].x)) /
+			(pts[i].x - pts[i - 1].x)) +
+			pts[i - 1].y);
+	}
+
+	return 0;
+}
+
 static void vadc_scale_calib(struct vadc_priv *vadc, u16 adc_code,
 			     const struct vadc_channel_prop *prop,
 			     s64 *scale_voltage)

@@ -502,6 +634,77 @@ static int vadc_scale_volt(struct vadc_priv *vadc,
 	return 0;
 }
 
+static int vadc_scale_therm(struct vadc_priv *vadc,
+			    const struct vadc_channel_prop *prop, u16 adc_code,
+			    int *result_mdec)
+{
+	s64 voltage = 0, result = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	if (prop->calibration == VADC_CALIB_ABSOLUTE)
+		voltage /= 1000;
+
+	vadc_map_voltage_temp(adcmap_100k_104ef_104fb,
+			      ARRAY_SIZE(adcmap_100k_104ef_104fb),
+			      voltage, &result);
+	result *= 1000;
+	*result_mdec = result;
+
+	return 0;
+}
+
+static int vadc_scale_die_temp(struct vadc_priv *vadc,
+			       const struct vadc_channel_prop *prop,
+			       u16 adc_code, int *result_mdec)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	if (voltage > 0) {
+		prescale = &vadc_prescale_ratios[prop->prescale];
+		voltage = voltage * prescale->den;
+		voltage /= (prescale->num * 2);
+	} else {
+		voltage = 0;
+	}
+
+	voltage -= KELVINMIL_CELSIUSMIL;
+	*result_mdec = voltage;
+
+	return 0;
+}
+
+static int vadc_scale_chg_temp(struct vadc_priv *vadc,
+			       const struct vadc_channel_prop *prop,
+			       u16 adc_code, int *result_mdec)
+{
+	const struct vadc_prescale_ratio *prescale;
+	s64 voltage = 0, result = 0;
+
+	vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+	prescale = &vadc_prescale_ratios[prop->prescale];
+	voltage = voltage * prescale->den;
+	voltage = div64_s64(voltage, prescale->num);
+	voltage = ((PMI_CHG_SCALE_1) * (voltage * 2));
+	voltage = (voltage + PMI_CHG_SCALE_2);
+	result =  div64_s64(voltage, 1000000);
+	*result_mdec = result;
+
+	return 0;
+}
+
+static int vadc_scale(struct vadc_priv *vadc,
+		      const struct vadc_channel_prop *prop, u16 adc_code,
+		      int *scale)
+{
+	dev_err(vadc->dev, "Need a scale function\n");
+	return 0;
+}
+
 static int vadc_decimation_from_dt(u32 value)
 {
 	if (!is_power_of_2(value) || value < VADC_DECIMATION_MIN ||

@@ -547,6 +750,15 @@ static int vadc_avg_samples_from_dt(u32 value)
 	return __ffs64(value);
 }
 
+static struct vadc_scale_fn scale_fn[] = {
+	[SCALE_DEFAULT] = {vadc_scale_volt},
+	[SCALE_THERM_100K_PULLUP] = {vadc_scale_therm},
+	[SCALE_PMIC_THERM] = {vadc_scale_die_temp},
+	[SCALE_XOTHERM] = {vadc_scale_therm},
+	[SCALE_PMI_CHG_TEMP] = {vadc_scale_chg_temp},
+	[SCALE_NONE] = {vadc_scale},
+};
+
 static int vadc_read_raw(struct iio_dev *indio_dev,
 			 struct iio_chan_spec const *chan, int *val, int *val2,
 			 long mask)

@@ -563,7 +775,7 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
 		if (ret)
 			break;
 
-		vadc_scale_volt(vadc, prop, adc_code, val);
+		scale_fn[prop->scale_fn].scale(vadc, prop, adc_code, val);
 
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_RAW:

@@ -606,23 +818,27 @@ struct vadc_channels {
 	unsigned int prescale_index;
 	enum iio_chan_type type;
 	long info_mask;
+	unsigned int scale_fn;
 };
 
-#define VADC_CHAN(_dname, _type, _mask, _pre)				\
+#define VADC_CHAN(_dname, _type, _mask, _pre, _scale)			\
 	[VADC_##_dname] = {						\
 		.datasheet_name = __stringify(_dname),			\
 		.prescale_index = _pre,					\
 		.type = _type,						\
-		.info_mask = _mask					\
+		.info_mask = _mask,					\
+		.scale_fn = _scale					\
 	},								\
 
-#define VADC_CHAN_TEMP(_dname, _pre)					\
-	VADC_CHAN(_dname, IIO_TEMP, BIT(IIO_CHAN_INFO_PROCESSED), _pre)	\
+#define VADC_CHAN_TEMP(_dname, _pre, _scale)				\

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 841

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +5 -2

+	VADC_CHAN(_dname, IIO_TEMP,					\
+		BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),	\
+		_pre, _scale)						\
 
-#define VADC_CHAN_VOLT(_dname, _pre)					\
+#define VADC_CHAN_VOLT(_dname, _pre, _scale)				\
 	VADC_CHAN(_dname, IIO_VOLTAGE,					\
 		  BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),\
-		  _pre)							\
+		  _pre, _scale)						\

In the SCALE_NONE case you are still creating the sysfs attributes to provide processed. Just have a variant of this macro that doesn't do this.

Quoted 6 lines

That way we don't end up with a sysfs attribute that always results in an error!
#define VADC_CHAN_VOLT_NO_KNOWN_SCALEE(_dname, _pre) \
	VADC_CHAN(_dname, IIO_VOLTAGE, BIT(IIO_CHAN_INFO_RAW), _pre);

sysfs attributes will be created only for the channels that are populated from DT. Here we are just mapping a function that needs to be invoked in case the channel is available.

None of the channels are exposed in sysfs unconditionally. Channels with DT entry only will get exposed in sysfs.

For SCALE_NONE .., none of these channels will get exposed in sysfs.
Even for other SCALE_* ., the channels will be shown in sysfs only if there is any corresponding DT entry for that channel.

If an entry is created for channels with SCALE_NONE in DT ., then the corresponding SCALE_* function needs to be implemented by removing SCALE_NONE.

Quoted 214 lines

Quoted 82 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-75~~

 /*
  * The array represents all possible ADC channels found in the supported PMICs.

@@ -630,106 +846,106 @@ struct vadc_channels {
  * gaps in the array should be treated as reserved channels.
  */
 static const struct vadc_channels vadc_chans[] = {
-	VADC_CHAN_VOLT(USBIN, 4)
-	VADC_CHAN_VOLT(DCIN, 4)
-	VADC_CHAN_VOLT(VCHG_SNS, 3)
-	VADC_CHAN_VOLT(SPARE1_03, 1)
-	VADC_CHAN_VOLT(USB_ID_MV, 1)
-	VADC_CHAN_VOLT(VCOIN, 1)
-	VADC_CHAN_VOLT(VBAT_SNS, 1)
-	VADC_CHAN_VOLT(VSYS, 1)
-	VADC_CHAN_TEMP(DIE_TEMP, 0)
-	VADC_CHAN_VOLT(REF_625MV, 0)
-	VADC_CHAN_VOLT(REF_1250MV, 0)
-	VADC_CHAN_VOLT(CHG_TEMP, 0)
-	VADC_CHAN_VOLT(SPARE1, 0)
-	VADC_CHAN_VOLT(SPARE2, 0)
-	VADC_CHAN_VOLT(GND_REF, 0)
-	VADC_CHAN_VOLT(VDD_VADC, 0)
-
-	VADC_CHAN_VOLT(P_MUX1_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX2_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX3_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX4_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX5_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX6_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX7_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX8_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX9_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX10_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX11_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX12_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX13_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX14_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX15_1_1, 0)
-	VADC_CHAN_VOLT(P_MUX16_1_1, 0)
-
-	VADC_CHAN_VOLT(P_MUX1_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX2_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX3_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX4_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX5_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX6_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX7_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX8_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX9_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX10_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX11_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX12_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX13_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX14_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX15_1_3, 1)
-	VADC_CHAN_VOLT(P_MUX16_1_3, 1)
-
-	VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0)
-	VADC_CHAN_VOLT(AMUX_PU1, 0)
-	VADC_CHAN_VOLT(AMUX_PU2, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU1_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU1_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU1_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU1_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU1_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU1_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU1_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0)

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 717

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-10~~

-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU2_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU2_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU2_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU2_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU2_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU2_AMUX_THM4, 0)

- VADC_CHAN_VOLT(LR_MUX9_PU2_AMUX_THM5, 0)

Quoted 121 lines

drivers/iio/adc/qcom-spmi-vadc.c +100 ~~-14~~

-	VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU2_XO_THERM, 0)
-
-	VADC_CHAN_VOLT(LR_MUX1_PU1_PU2_BAT_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_PU1_PU2_XO_THERM, 0)
-	VADC_CHAN_VOLT(LR_MUX4_PU1_PU2_AMUX_THM1, 0)
-	VADC_CHAN_VOLT(LR_MUX5_PU1_PU2_AMUX_THM2, 0)
-	VADC_CHAN_VOLT(LR_MUX6_PU1_PU2_AMUX_THM3, 0)
-	VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX8_PU1_PU2_AMUX_THM4, 0)
-	VADC_CHAN_VOLT(LR_MUX9_PU1_PU2_AMUX_THM5, 0)
-	VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0)
-	VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0)
+	VADC_CHAN_VOLT(USBIN, 4, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(DCIN, 4, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VCHG_SNS, 3, SCALE_NONE)
+	VADC_CHAN_VOLT(SPARE1_03, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(USB_ID_MV, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(VCOIN, 1, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VBAT_SNS, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(VSYS, 1, SCALE_DEFAULT)
+	VADC_CHAN_TEMP(DIE_TEMP, 0, SCALE_PMIC_THERM)
+	VADC_CHAN_VOLT(REF_625MV, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(REF_1250MV, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(CHG_TEMP, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(SPARE1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(SPARE2, 0, SCALE_PMI_CHG_TEMP)
+	VADC_CHAN_VOLT(GND_REF, 0, SCALE_DEFAULT)
+	VADC_CHAN_VOLT(VDD_VADC, 0, SCALE_DEFAULT)
+
+	VADC_CHAN_VOLT(P_MUX1_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX2_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX3_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX4_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX5_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX6_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX7_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX8_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX9_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX10_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX11_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX12_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX13_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX14_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX15_1_1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX16_1_1, 0, SCALE_NONE)
+
+	VADC_CHAN_VOLT(P_MUX1_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX2_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX3_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX4_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX5_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX6_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX7_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX8_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX9_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX10_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX11_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX12_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX13_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX14_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX15_1_3, 1, SCALE_NONE)
+	VADC_CHAN_VOLT(P_MUX16_1_3, 1, SCALE_NONE)
+
+	VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(AMUX_PU1, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(AMUX_PU2, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0, SCALE_NONE)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU1_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU1_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU1_AMUX_THM1, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX5_PU1_AMUX_THM2, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX6_PU1_AMUX_THM3, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU1_AMUX_THM4, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_TEMP(LR_MUX9_PU1_AMUX_THM5, 0, SCALE_THERM_100K_PULLUP)
+	VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_XO_THERM, 0, SCALE_XOTHERM)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU2_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU2_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU2_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX5_PU2_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX6_PU2_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU2_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX9_PU2_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU2_XO_THERM, 0, SCALE_NONE)
+
+	VADC_CHAN_TEMP(LR_MUX1_PU1_PU2_BAT_THERM, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_PU1_PU2_XO_THERM, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX4_PU1_PU2_AMUX_THM1, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX5_PU1_PU2_AMUX_THM2, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX6_PU1_PU2_AMUX_THM3, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX8_PU1_PU2_AMUX_THM4, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX9_PU1_PU2_AMUX_THM5, 0, SCALE_NONE)
+	VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+	VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0, SCALE_NONE)
 };
 
 static int vadc_get_dt_channel_data(struct device *dev,

@@ -848,6 +1064,7 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
 			return ret;
 		}

Quoted 6 lines

drivers/iio/adc/qcom-spmi-vadc.c static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node) · line 1070
Quoted 5 lines
drivers/iio/adc/qcom-spmi-vadc.c +1 -0
+		prop.scale_fn = vadc_chans[prop.channel].scale_fn;
 		vadc->chan_props[index] = prop;
 
 		vadc_chan = &vadc_chans[prop.channel];

Thanks,
Ramakrishna

Jonathan Cameron

maintainer

2016-12-03 15:06 UTC #7 lore raw

Re: [PATCH V5 2/2] iio: adc: spmi-vadc: Changes to support different scaling

Quoted 367 lines · Rama Krishna

Hi Jonathan,

Quoted 10 lines · Jonathan Cameron

Quoted 9 lines · Rama Krishna Phani A
Several ADC channels are supported in PMIC which can be used to measure voltage, temperature, current etc. Different scaling can be applied on the obtained voltage to report in physical units. Scaling functionality can be different per channel. Add scaling support per channel. Every channel present in adc has an unique conversion formula for obtained voltage. Add support to report in Raw as well as in processed format. Scaling is applied when processed read is requested and is not applied when a Raw read is requested.

Quoted 5 lines

Quoted 1 line
Signed-off-by Rama Krishna Phani A <[email protected]>
I obviously didn't make it clear enough in last review.
If you can't return a value in response to reading a sysfs attribute, the attribute should not exist. See below for a suggestion on this.

Agree., Even here we never expose a channel in sysfs if we dont know the response. Channels in sysfs are populated based on list available from DT. Provided more explanation below.

Quoted 342 lines

Jonathan

Quoted 327 lines

---
 drivers/iio/adc/qcom-spmi-vadc.c | 435 +++++++++++++++++++++++++++++----------
 1 file changed, 326 insertions(+), 109 deletions(-)

drivers/iio/adc/qcom-spmi-vadc.c +220 -7

index 93c0639..a4e5405 100644
@@ -84,7 +84,7 @@
 #define VADC_MAX_ADC_CODE            0xa800
 
 #define VADC_ABSOLUTE_RANGE_UV            625000
-#define VADC_RATIOMETRIC_RANGE_UV        1800000
+#define VADC_RATIOMETRIC_RANGE            1800
 
 #define VADC_DEF_PRESCALING            0 /* 1:1 */
 #define VADC_DEF_DECIMATION            0 /* 512 */

@@ -100,9 +100,23 @@
 
 #define KELVINMIL_CELSIUSMIL            273150
 
+#define PMI_CHG_SCALE_1                -138890
+#define PMI_CHG_SCALE_2                391750000000
+
 #define VADC_CHAN_MIN            VADC_USBIN
 #define VADC_CHAN_MAX            VADC_LR_MUX3_BUF_PU1_PU2_XO_THERM
 
+/**
+ * struct vadc_map_pt - Map the graph representation for ADC channel
+ * @x: Represent the ADC digitized code.
+ * @y: Represent the physical data which can be temperature, voltage,
+ *     resistance.
+ */
+struct vadc_map_pt {
+    s32 x;
+    s32 y;
+};
+
 /*
  * VADC_CALIB_ABSOLUTE: uses the 625mV and 1.25V as reference channels.
  * VADC_CALIB_RATIOMETRIC: uses the reference voltage (1.8V) and GND for

@@ -148,6 +162,9 @@ struct vadc_prescale_ratio {
  *    start of conversion.
  * @avg_samples: ability to provide single result from the ADC
  *    that is an average of multiple measurements.
+ * @scale_fn: Represents the scaling function to convert voltage
+ *    physical units desired by the client for the channel.
+ *    Referenced from enum vadc_scale_fn_type.
  */
 struct vadc_channel_prop {
     unsigned int channel;

@@ -156,6 +173,7 @@ struct vadc_channel_prop {
     unsigned int prescale;
     unsigned int hw_settle_time;
     unsigned int avg_samples;
+    unsigned int scale_fn;
 };
 
 /**

@@ -186,6 +204,37 @@ struct vadc_priv {
     struct mutex         lock;
 };
 
+/**
+ * struct vadc_scale_fn - Scaling function prototype
+ * @scale: Function pointer to one of the scaling functions
+ *    which takes the adc properties, channel properties,
+ *    and returns the physical result.
+ */
+struct vadc_scale_fn {
+    int (*scale)(struct vadc_priv *, const struct vadc_channel_prop *,
+             u16, int *);
+};
+
+/**
+ * enum vadc_scale_fn_type - Scaling function to convert ADC code to
+ *                physical scaled units for the channel.
+ * SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).
+ * SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.
+ *                 Uses a mapping table with 100K pullup.
+ * SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.
+ * SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.
+ * SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp
+ * SCALE_NONE: Do not use this scaling type.
+ */
+enum vadc_scale_fn_type {
+    SCALE_DEFAULT = 0,
+    SCALE_THERM_100K_PULLUP,
+    SCALE_PMIC_THERM,
+    SCALE_XOTHERM,
+    SCALE_PMI_CHG_TEMP,
+    SCALE_NONE,
+};
+
 static const struct vadc_prescale_ratio vadc_prescale_ratios[] = {
     {.num =  1, .den =  1},
     {.num =  1, .den =  3},

@@ -197,6 +246,44 @@ struct vadc_priv {
     {.num =  1, .den = 10}
 };
 
+/* Voltage to temperature */
+static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
+    {1758,    -40},
+    {1742,    -35},
+    {1719,    -30},
+    {1691,    -25},
+    {1654,    -20},
+    {1608,    -15},
+    {1551,    -10},
+    {1483,    -5},
+    {1404,    0},
+    {1315,    5},
+    {1218,    10},
+    {1114,    15},
+    {1007,    20},
+    {900,    25},
+    {795,    30},
+    {696,    35},
+    {605,    40},
+    {522,    45},
+    {448,    50},
+    {383,    55},
+    {327,    60},
+    {278,    65},
+    {237,    70},
+    {202,    75},
+    {172,    80},
+    {146,    85},
+    {125,    90},
+    {107,    95},
+    {92,    100},
+    {79,    105},
+    {68,    110},
+    {59,    115},
+    {51,    120},
+    {44,    125}
+};
+
 static int vadc_read(struct vadc_priv *vadc, u16 offset, u8 *data)
 {
     return regmap_bulk_read(vadc->regmap, vadc->base + offset, data, 1);

@@ -418,7 +505,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
     u16 read_1, read_2;
     int ret;
 
-    vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE_UV;
+    vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE;
     vadc->graph[VADC_CALIB_ABSOLUTE].dx = VADC_ABSOLUTE_RANGE_UV;
 
     prop = vadc_get_channel(vadc, VADC_REF_1250MV);

@@ -468,6 +555,51 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
     return ret;
 }
 
+static int vadc_map_voltage_temp(const struct vadc_map_pt *pts,
+                 u32 tablesize, s32 input, s64 *output)
+{
+    bool descending = 1;
+    u32 i = 0;
+
+    if (!pts)
+        return -EINVAL;
+
+    /* Check if table is descending or ascending */
+    if (tablesize > 1) {
+        if (pts[0].x < pts[1].x)
+            descending = 0;
+    }
+
+    while (i < tablesize) {
+        if ((descending) && (pts[i].x < input)) {
+            /* table entry is less than measured*/
+             /* value and table is descending, stop */
+            break;
+        } else if ((!descending) &&
+                (pts[i].x > input)) {
+            /* table entry is greater than measured*/
+            /*value and table is ascending, stop */
+            break;
+        }
+        i++;
+    }
+
+    if (i == 0) {
+        *output = pts[0].y;
+    } else if (i == tablesize) {
+        *output = pts[tablesize - 1].y;
+    } else {
+        /* result is between search_index and search_index-1 */
+        /* interpolate linearly */
+        *output = (((s32)((pts[i].y - pts[i - 1].y) *
+            (input - pts[i - 1].x)) /
+            (pts[i].x - pts[i - 1].x)) +
+            pts[i - 1].y);
+    }
+
+    return 0;
+}
+
 static void vadc_scale_calib(struct vadc_priv *vadc, u16 adc_code,
                  const struct vadc_channel_prop *prop,
                  s64 *scale_voltage)

@@ -502,6 +634,77 @@ static int vadc_scale_volt(struct vadc_priv *vadc,
     return 0;
 }
 
+static int vadc_scale_therm(struct vadc_priv *vadc,
+                const struct vadc_channel_prop *prop, u16 adc_code,
+                int *result_mdec)
+{
+    s64 voltage = 0, result = 0;
+
+    vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+    if (prop->calibration == VADC_CALIB_ABSOLUTE)
+        voltage /= 1000;
+
+    vadc_map_voltage_temp(adcmap_100k_104ef_104fb,
+                  ARRAY_SIZE(adcmap_100k_104ef_104fb),
+                  voltage, &result);
+    result *= 1000;
+    *result_mdec = result;
+
+    return 0;
+}
+
+static int vadc_scale_die_temp(struct vadc_priv *vadc,
+                   const struct vadc_channel_prop *prop,
+                   u16 adc_code, int *result_mdec)
+{
+    const struct vadc_prescale_ratio *prescale;
+    s64 voltage = 0;
+
+    vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+    if (voltage > 0) {
+        prescale = &vadc_prescale_ratios[prop->prescale];
+        voltage = voltage * prescale->den;
+        voltage /= (prescale->num * 2);
+    } else {
+        voltage = 0;
+    }
+
+    voltage -= KELVINMIL_CELSIUSMIL;
+    *result_mdec = voltage;
+
+    return 0;
+}
+
+static int vadc_scale_chg_temp(struct vadc_priv *vadc,
+                   const struct vadc_channel_prop *prop,
+                   u16 adc_code, int *result_mdec)
+{
+    const struct vadc_prescale_ratio *prescale;
+    s64 voltage = 0, result = 0;
+
+    vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+    prescale = &vadc_prescale_ratios[prop->prescale];
+    voltage = voltage * prescale->den;
+    voltage = div64_s64(voltage, prescale->num);
+    voltage = ((PMI_CHG_SCALE_1) * (voltage * 2));
+    voltage = (voltage + PMI_CHG_SCALE_2);
+    result =  div64_s64(voltage, 1000000);
+    *result_mdec = result;
+
+    return 0;
+}
+
+static int vadc_scale(struct vadc_priv *vadc,
+              const struct vadc_channel_prop *prop, u16 adc_code,
+              int *scale)
+{
+    dev_err(vadc->dev, "Need a scale function\n");
+    return 0;
+}
+
 static int vadc_decimation_from_dt(u32 value)
 {
     if (!is_power_of_2(value) || value < VADC_DECIMATION_MIN ||

@@ -547,6 +750,15 @@ static int vadc_avg_samples_from_dt(u32 value)
     return __ffs64(value);
 }
 
+static struct vadc_scale_fn scale_fn[] = {
+    [SCALE_DEFAULT] = {vadc_scale_volt},
+    [SCALE_THERM_100K_PULLUP] = {vadc_scale_therm},
+    [SCALE_PMIC_THERM] = {vadc_scale_die_temp},
+    [SCALE_XOTHERM] = {vadc_scale_therm},
+    [SCALE_PMI_CHG_TEMP] = {vadc_scale_chg_temp},
+    [SCALE_NONE] = {vadc_scale},
+};
+
 static int vadc_read_raw(struct iio_dev *indio_dev,
              struct iio_chan_spec const *chan, int *val, int *val2,
              long mask)

@@ -563,7 +775,7 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
         if (ret)
             break;
 
-        vadc_scale_volt(vadc, prop, adc_code, val);
+        scale_fn[prop->scale_fn].scale(vadc, prop, adc_code, val);
 
         return IIO_VAL_INT;
     case IIO_CHAN_INFO_RAW:

@@ -606,23 +818,27 @@ struct vadc_channels {
     unsigned int prescale_index;
     enum iio_chan_type type;
     long info_mask;
+    unsigned int scale_fn;
 };
 
-#define VADC_CHAN(_dname, _type, _mask, _pre)                \
+#define VADC_CHAN(_dname, _type, _mask, _pre, _scale)            \
     [VADC_##_dname] = {                        \
         .datasheet_name = __stringify(_dname),            \
         .prescale_index = _pre,                    \
         .type = _type,                        \
-        .info_mask = _mask                    \
+        .info_mask = _mask,                    \
+        .scale_fn = _scale                    \
     },                                \
 
-#define VADC_CHAN_TEMP(_dname, _pre)                    \
-    VADC_CHAN(_dname, IIO_TEMP, BIT(IIO_CHAN_INFO_PROCESSED), _pre)    \
+#define VADC_CHAN_TEMP(_dname, _pre, _scale)                \

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 841

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +5 -2

+    VADC_CHAN(_dname, IIO_TEMP,                    \
+        BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),    \
+        _pre, _scale)                        \
 
-#define VADC_CHAN_VOLT(_dname, _pre)                    \
+#define VADC_CHAN_VOLT(_dname, _pre, _scale)                \
     VADC_CHAN(_dname, IIO_VOLTAGE,                    \
           BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),\
-          _pre)                            \
+          _pre, _scale)                        \

In the SCALE_NONE case you are still creating the sysfs attributes to provide processed. Just have a variant of this macro that doesn't do this.

Quoted 6 lines

That way we don't end up with a sysfs attribute that always results in an error!
#define VADC_CHAN_VOLT_NO_KNOWN_SCALEE(_dname, _pre) \
    VADC_CHAN(_dname, IIO_VOLTAGE, BIT(IIO_CHAN_INFO_RAW), _pre);

Quoted 6 lines

sysfs attributes will be created only for the channels that are populated from DT. Here we are just mapping a function that needs to be invoked in case the channel is available.
None of the channels are exposed in sysfs unconditionally. Channels with DT entry only will get exposed in sysfs.
For SCALE_NONE .., none of these channels will get exposed in sysfs.
Even for other SCALE_* ., the channels will be shown in sysfs only if there is any corresponding DT entry for that channel.

But if someone does write a DT that specifies those channels then it'll be wrong. The fix is easy. Fix it in here.

Quoted 228 lines

If an entry is created for channels with SCALE_NONE in DT ., then the corresponding SCALE_* function needs to be implemented by removing SCALE_NONE.

Quoted 214 lines

Quoted 82 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-75~~

 /*
  * The array represents all possible ADC channels found in the supported PMICs.

@@ -630,106 +846,106 @@ struct vadc_channels {
  * gaps in the array should be treated as reserved channels.
  */
 static const struct vadc_channels vadc_chans[] = {
-    VADC_CHAN_VOLT(USBIN, 4)
-    VADC_CHAN_VOLT(DCIN, 4)
-    VADC_CHAN_VOLT(VCHG_SNS, 3)
-    VADC_CHAN_VOLT(SPARE1_03, 1)
-    VADC_CHAN_VOLT(USB_ID_MV, 1)
-    VADC_CHAN_VOLT(VCOIN, 1)
-    VADC_CHAN_VOLT(VBAT_SNS, 1)
-    VADC_CHAN_VOLT(VSYS, 1)
-    VADC_CHAN_TEMP(DIE_TEMP, 0)
-    VADC_CHAN_VOLT(REF_625MV, 0)
-    VADC_CHAN_VOLT(REF_1250MV, 0)
-    VADC_CHAN_VOLT(CHG_TEMP, 0)
-    VADC_CHAN_VOLT(SPARE1, 0)
-    VADC_CHAN_VOLT(SPARE2, 0)
-    VADC_CHAN_VOLT(GND_REF, 0)
-    VADC_CHAN_VOLT(VDD_VADC, 0)
-
-    VADC_CHAN_VOLT(P_MUX1_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX2_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX3_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX4_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX5_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX6_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX7_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX8_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX9_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX10_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX11_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX12_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX13_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX14_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX15_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX16_1_1, 0)
-
-    VADC_CHAN_VOLT(P_MUX1_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX2_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX3_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX4_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX5_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX6_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX7_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX8_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX9_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX10_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX11_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX12_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX13_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX14_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX15_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX16_1_3, 1)
-
-    VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0)
-    VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0)
-    VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0)
-    VADC_CHAN_VOLT(AMUX_PU1, 0)
-    VADC_CHAN_VOLT(AMUX_PU2, 0)
-    VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0)
-
-    VADC_CHAN_VOLT(LR_MUX1_PU1_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_PU1_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_PU1_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_PU1_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_PU1_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_PU1_AMUX_THM4, 0)
-    VADC_CHAN_VOLT(LR_MUX9_PU1_AMUX_THM5, 0)
-    VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0)

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 717

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-10~~

-    VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_XO_THERM, 0)
-
-    VADC_CHAN_VOLT(LR_MUX1_PU2_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_PU2_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_PU2_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_PU2_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_PU2_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_PU2_AMUX_THM4, 0)

- VADC_CHAN_VOLT(LR_MUX9_PU2_AMUX_THM5, 0)

Quoted 121 lines

drivers/iio/adc/qcom-spmi-vadc.c +100 ~~-14~~

-    VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_BUF_PU2_XO_THERM, 0)
-
-    VADC_CHAN_VOLT(LR_MUX1_PU1_PU2_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_PU1_PU2_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_PU1_PU2_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_PU1_PU2_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_PU1_PU2_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_PU1_PU2_AMUX_THM4, 0)
-    VADC_CHAN_VOLT(LR_MUX9_PU1_PU2_AMUX_THM5, 0)
-    VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0)
+    VADC_CHAN_VOLT(USBIN, 4, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(DCIN, 4, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(VCHG_SNS, 3, SCALE_NONE)
+    VADC_CHAN_VOLT(SPARE1_03, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(USB_ID_MV, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(VCOIN, 1, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(VBAT_SNS, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(VSYS, 1, SCALE_DEFAULT)
+    VADC_CHAN_TEMP(DIE_TEMP, 0, SCALE_PMIC_THERM)
+    VADC_CHAN_VOLT(REF_625MV, 0, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(REF_1250MV, 0, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(CHG_TEMP, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(SPARE1, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(SPARE2, 0, SCALE_PMI_CHG_TEMP)
+    VADC_CHAN_VOLT(GND_REF, 0, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(VDD_VADC, 0, SCALE_DEFAULT)
+
+    VADC_CHAN_VOLT(P_MUX1_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX2_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX3_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX4_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX5_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX6_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX7_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX8_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX9_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX10_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX11_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX12_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX13_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX14_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX15_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX16_1_1, 0, SCALE_NONE)
+
+    VADC_CHAN_VOLT(P_MUX1_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX2_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX3_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX4_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX5_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX6_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX7_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX8_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX9_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX10_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX11_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX12_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX13_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX14_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX15_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX16_1_3, 1, SCALE_NONE)
+
+    VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(AMUX_PU1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(AMUX_PU2, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0, SCALE_NONE)
+
+    VADC_CHAN_TEMP(LR_MUX1_PU1_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_PU1_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX4_PU1_AMUX_THM1, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_TEMP(LR_MUX5_PU1_AMUX_THM2, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_TEMP(LR_MUX6_PU1_AMUX_THM3, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX8_PU1_AMUX_THM4, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_TEMP(LR_MUX9_PU1_AMUX_THM5, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_XO_THERM, 0, SCALE_XOTHERM)
+
+    VADC_CHAN_TEMP(LR_MUX1_PU2_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_PU2_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX4_PU2_AMUX_THM1, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX5_PU2_AMUX_THM2, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX6_PU2_AMUX_THM3, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX8_PU2_AMUX_THM4, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX9_PU2_AMUX_THM5, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_BUF_PU2_XO_THERM, 0, SCALE_NONE)
+
+    VADC_CHAN_TEMP(LR_MUX1_PU1_PU2_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_PU1_PU2_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX4_PU1_PU2_AMUX_THM1, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX5_PU1_PU2_AMUX_THM2, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX6_PU1_PU2_AMUX_THM3, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX8_PU1_PU2_AMUX_THM4, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX9_PU1_PU2_AMUX_THM5, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0, SCALE_NONE)
 };
 
 static int vadc_get_dt_channel_data(struct device *dev,

@@ -848,6 +1064,7 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
             return ret;
         }

Quoted 6 lines

drivers/iio/adc/qcom-spmi-vadc.c static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node) · line 1070
Quoted 5 lines
drivers/iio/adc/qcom-spmi-vadc.c +1 -0
+        prop.scale_fn = vadc_chans[prop.channel].scale_fn;
         vadc->chan_props[index] = prop;
 
         vadc_chan = &vadc_chans[prop.channel];

Thanks,
Ramakrishna

Signature · 3 lines

To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 4bd45f1b-d2c2-a7e6-d0f4-0cfbb196f805-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org

Phani A, Rama Krishna

author

2016-12-09 14:40 UTC #9 lore raw

Re: [PATCH V5 2/2] iio: adc: spmi-vadc: Changes to support different scaling

Hi Jonathan,

Quoted 368 lines · Jonathan Cameron

Quoted 367 lines · Rama Krishna

Hi Jonathan,

Quoted 10 lines · Jonathan Cameron

Quoted 9 lines · Rama Krishna Phani A
Several ADC channels are supported in PMIC which can be used to measure voltage, temperature, current etc. Different scaling can be applied on the obtained voltage to report in physical units. Scaling functionality can be different per channel. Add scaling support per channel. Every channel present in adc has an unique conversion formula for obtained voltage. Add support to report in Raw as well as in processed format. Scaling is applied when processed read is requested and is not applied when a Raw read is requested.

Quoted 5 lines

Quoted 1 line
Signed-off-by Rama Krishna Phani A <[email protected]>
I obviously didn't make it clear enough in last review.
If you can't return a value in response to reading a sysfs attribute, the attribute should not exist. See below for a suggestion on this.

Agree., Even here we never expose a channel in sysfs if we dont know the response. Channels in sysfs are populated based on list available from DT. Provided more explanation below.

Quoted 348 lines

Jonathan

Quoted 327 lines

---
 drivers/iio/adc/qcom-spmi-vadc.c | 435 +++++++++++++++++++++++++++++----------
 1 file changed, 326 insertions(+), 109 deletions(-)

drivers/iio/adc/qcom-spmi-vadc.c +220 -7

index 93c0639..a4e5405 100644
@@ -84,7 +84,7 @@
 #define VADC_MAX_ADC_CODE            0xa800
 
 #define VADC_ABSOLUTE_RANGE_UV            625000
-#define VADC_RATIOMETRIC_RANGE_UV        1800000
+#define VADC_RATIOMETRIC_RANGE            1800
 
 #define VADC_DEF_PRESCALING            0 /* 1:1 */
 #define VADC_DEF_DECIMATION            0 /* 512 */

@@ -100,9 +100,23 @@
 
 #define KELVINMIL_CELSIUSMIL            273150
 
+#define PMI_CHG_SCALE_1                -138890
+#define PMI_CHG_SCALE_2                391750000000
+
 #define VADC_CHAN_MIN            VADC_USBIN
 #define VADC_CHAN_MAX            VADC_LR_MUX3_BUF_PU1_PU2_XO_THERM
 
+/**
+ * struct vadc_map_pt - Map the graph representation for ADC channel
+ * @x: Represent the ADC digitized code.
+ * @y: Represent the physical data which can be temperature, voltage,
+ *     resistance.
+ */
+struct vadc_map_pt {
+    s32 x;
+    s32 y;
+};
+
 /*
  * VADC_CALIB_ABSOLUTE: uses the 625mV and 1.25V as reference channels.
  * VADC_CALIB_RATIOMETRIC: uses the reference voltage (1.8V) and GND for

@@ -148,6 +162,9 @@ struct vadc_prescale_ratio {
  *    start of conversion.
  * @avg_samples: ability to provide single result from the ADC
  *    that is an average of multiple measurements.
+ * @scale_fn: Represents the scaling function to convert voltage
+ *    physical units desired by the client for the channel.
+ *    Referenced from enum vadc_scale_fn_type.
  */
 struct vadc_channel_prop {
     unsigned int channel;

@@ -156,6 +173,7 @@ struct vadc_channel_prop {
     unsigned int prescale;
     unsigned int hw_settle_time;
     unsigned int avg_samples;
+    unsigned int scale_fn;
 };
 
 /**

@@ -186,6 +204,37 @@ struct vadc_priv {
     struct mutex         lock;
 };
 
+/**
+ * struct vadc_scale_fn - Scaling function prototype
+ * @scale: Function pointer to one of the scaling functions
+ *    which takes the adc properties, channel properties,
+ *    and returns the physical result.
+ */
+struct vadc_scale_fn {
+    int (*scale)(struct vadc_priv *, const struct vadc_channel_prop *,
+             u16, int *);
+};
+
+/**
+ * enum vadc_scale_fn_type - Scaling function to convert ADC code to
+ *                physical scaled units for the channel.
+ * SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).
+ * SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.
+ *                 Uses a mapping table with 100K pullup.
+ * SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.
+ * SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.
+ * SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp
+ * SCALE_NONE: Do not use this scaling type.
+ */
+enum vadc_scale_fn_type {
+    SCALE_DEFAULT = 0,
+    SCALE_THERM_100K_PULLUP,
+    SCALE_PMIC_THERM,
+    SCALE_XOTHERM,
+    SCALE_PMI_CHG_TEMP,
+    SCALE_NONE,
+};
+
 static const struct vadc_prescale_ratio vadc_prescale_ratios[] = {
     {.num =  1, .den =  1},
     {.num =  1, .den =  3},

@@ -197,6 +246,44 @@ struct vadc_priv {
     {.num =  1, .den = 10}
 };
 
+/* Voltage to temperature */
+static const struct vadc_map_pt adcmap_100k_104ef_104fb[] = {
+    {1758,    -40},
+    {1742,    -35},
+    {1719,    -30},
+    {1691,    -25},
+    {1654,    -20},
+    {1608,    -15},
+    {1551,    -10},
+    {1483,    -5},
+    {1404,    0},
+    {1315,    5},
+    {1218,    10},
+    {1114,    15},
+    {1007,    20},
+    {900,    25},
+    {795,    30},
+    {696,    35},
+    {605,    40},
+    {522,    45},
+    {448,    50},
+    {383,    55},
+    {327,    60},
+    {278,    65},
+    {237,    70},
+    {202,    75},
+    {172,    80},
+    {146,    85},
+    {125,    90},
+    {107,    95},
+    {92,    100},
+    {79,    105},
+    {68,    110},
+    {59,    115},
+    {51,    120},
+    {44,    125}
+};
+
 static int vadc_read(struct vadc_priv *vadc, u16 offset, u8 *data)
 {
     return regmap_bulk_read(vadc->regmap, vadc->base + offset, data, 1);

@@ -418,7 +505,7 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
     u16 read_1, read_2;
     int ret;
 
-    vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE_UV;
+    vadc->graph[VADC_CALIB_RATIOMETRIC].dx = VADC_RATIOMETRIC_RANGE;
     vadc->graph[VADC_CALIB_ABSOLUTE].dx = VADC_ABSOLUTE_RANGE_UV;
 
     prop = vadc_get_channel(vadc, VADC_REF_1250MV);

@@ -468,6 +555,51 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
     return ret;
 }
 
+static int vadc_map_voltage_temp(const struct vadc_map_pt *pts,
+                 u32 tablesize, s32 input, s64 *output)
+{
+    bool descending = 1;
+    u32 i = 0;
+
+    if (!pts)
+        return -EINVAL;
+
+    /* Check if table is descending or ascending */
+    if (tablesize > 1) {
+        if (pts[0].x < pts[1].x)
+            descending = 0;
+    }
+
+    while (i < tablesize) {
+        if ((descending) && (pts[i].x < input)) {
+            /* table entry is less than measured*/
+             /* value and table is descending, stop */
+            break;
+        } else if ((!descending) &&
+                (pts[i].x > input)) {
+            /* table entry is greater than measured*/
+            /*value and table is ascending, stop */
+            break;
+        }
+        i++;
+    }
+
+    if (i == 0) {
+        *output = pts[0].y;
+    } else if (i == tablesize) {
+        *output = pts[tablesize - 1].y;
+    } else {
+        /* result is between search_index and search_index-1 */
+        /* interpolate linearly */
+        *output = (((s32)((pts[i].y - pts[i - 1].y) *
+            (input - pts[i - 1].x)) /
+            (pts[i].x - pts[i - 1].x)) +
+            pts[i - 1].y);
+    }
+
+    return 0;
+}
+
 static void vadc_scale_calib(struct vadc_priv *vadc, u16 adc_code,
                  const struct vadc_channel_prop *prop,
                  s64 *scale_voltage)

@@ -502,6 +634,77 @@ static int vadc_scale_volt(struct vadc_priv *vadc,
     return 0;
 }
 
+static int vadc_scale_therm(struct vadc_priv *vadc,
+                const struct vadc_channel_prop *prop, u16 adc_code,
+                int *result_mdec)
+{
+    s64 voltage = 0, result = 0;
+
+    vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+    if (prop->calibration == VADC_CALIB_ABSOLUTE)
+        voltage /= 1000;
+
+    vadc_map_voltage_temp(adcmap_100k_104ef_104fb,
+                  ARRAY_SIZE(adcmap_100k_104ef_104fb),
+                  voltage, &result);
+    result *= 1000;
+    *result_mdec = result;
+
+    return 0;
+}
+
+static int vadc_scale_die_temp(struct vadc_priv *vadc,
+                   const struct vadc_channel_prop *prop,
+                   u16 adc_code, int *result_mdec)
+{
+    const struct vadc_prescale_ratio *prescale;
+    s64 voltage = 0;
+
+    vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+    if (voltage > 0) {
+        prescale = &vadc_prescale_ratios[prop->prescale];
+        voltage = voltage * prescale->den;
+        voltage /= (prescale->num * 2);
+    } else {
+        voltage = 0;
+    }
+
+    voltage -= KELVINMIL_CELSIUSMIL;
+    *result_mdec = voltage;
+
+    return 0;
+}
+
+static int vadc_scale_chg_temp(struct vadc_priv *vadc,
+                   const struct vadc_channel_prop *prop,
+                   u16 adc_code, int *result_mdec)
+{
+    const struct vadc_prescale_ratio *prescale;
+    s64 voltage = 0, result = 0;
+
+    vadc_scale_calib(vadc, adc_code, prop, &voltage);
+
+    prescale = &vadc_prescale_ratios[prop->prescale];
+    voltage = voltage * prescale->den;
+    voltage = div64_s64(voltage, prescale->num);
+    voltage = ((PMI_CHG_SCALE_1) * (voltage * 2));
+    voltage = (voltage + PMI_CHG_SCALE_2);
+    result =  div64_s64(voltage, 1000000);
+    *result_mdec = result;
+
+    return 0;
+}
+
+static int vadc_scale(struct vadc_priv *vadc,
+              const struct vadc_channel_prop *prop, u16 adc_code,
+              int *scale)
+{
+    dev_err(vadc->dev, "Need a scale function\n");
+    return 0;
+}
+
 static int vadc_decimation_from_dt(u32 value)
 {
     if (!is_power_of_2(value) || value < VADC_DECIMATION_MIN ||

@@ -547,6 +750,15 @@ static int vadc_avg_samples_from_dt(u32 value)
     return __ffs64(value);
 }
 
+static struct vadc_scale_fn scale_fn[] = {
+    [SCALE_DEFAULT] = {vadc_scale_volt},
+    [SCALE_THERM_100K_PULLUP] = {vadc_scale_therm},
+    [SCALE_PMIC_THERM] = {vadc_scale_die_temp},
+    [SCALE_XOTHERM] = {vadc_scale_therm},
+    [SCALE_PMI_CHG_TEMP] = {vadc_scale_chg_temp},
+    [SCALE_NONE] = {vadc_scale},
+};
+
 static int vadc_read_raw(struct iio_dev *indio_dev,
              struct iio_chan_spec const *chan, int *val, int *val2,
              long mask)

@@ -563,7 +775,7 @@ static int vadc_read_raw(struct iio_dev *indio_dev,
         if (ret)
             break;
 
-        vadc_scale_volt(vadc, prop, adc_code, val);
+        scale_fn[prop->scale_fn].scale(vadc, prop, adc_code, val);
 
         return IIO_VAL_INT;
     case IIO_CHAN_INFO_RAW:

@@ -606,23 +818,27 @@ struct vadc_channels {
     unsigned int prescale_index;
     enum iio_chan_type type;
     long info_mask;
+    unsigned int scale_fn;
 };
 
-#define VADC_CHAN(_dname, _type, _mask, _pre)                \
+#define VADC_CHAN(_dname, _type, _mask, _pre, _scale)            \
     [VADC_##_dname] = {                        \
         .datasheet_name = __stringify(_dname),            \
         .prescale_index = _pre,                    \
         .type = _type,                        \
-        .info_mask = _mask                    \
+        .info_mask = _mask,                    \
+        .scale_fn = _scale                    \
     },                                \
 
-#define VADC_CHAN_TEMP(_dname, _pre)                    \
-    VADC_CHAN(_dname, IIO_TEMP, BIT(IIO_CHAN_INFO_PROCESSED), _pre)    \
+#define VADC_CHAN_TEMP(_dname, _pre, _scale)                \

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 841

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +5 -2

+    VADC_CHAN(_dname, IIO_TEMP,                    \
+        BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),    \
+        _pre, _scale)                        \
 
-#define VADC_CHAN_VOLT(_dname, _pre)                    \
+#define VADC_CHAN_VOLT(_dname, _pre, _scale)                \
     VADC_CHAN(_dname, IIO_VOLTAGE,                    \
           BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED),\
-          _pre)                            \
+          _pre, _scale)                        \

In the SCALE_NONE case you are still creating the sysfs attributes to provide processed. Just have a variant of this macro that doesn't do this.

That way we don't end up with a sysfs attribute that always results in an error!

#define VADC_CHAN_VOLT_NO_KNOWN_SCALEE(_dname, _pre) \
    VADC_CHAN(_dname, IIO_VOLTAGE, BIT(IIO_CHAN_INFO_RAW), _pre);

Quoted 8 lines

Quoted 6 lines
sysfs attributes will be created only for the channels that are populated from DT. Here we are just mapping a function that needs to be invoked in case the channel is available.
None of the channels are exposed in sysfs unconditionally. Channels with DT entry only will get exposed in sysfs.
For SCALE_NONE .., none of these channels will get exposed in sysfs.
Even for other SCALE_* ., the channels will be shown in sysfs only if there is any corresponding DT entry for that channel.
But if someone does write a DT that specifies those channels then it'll be wrong. The fix is easy. Fix it in here.

Sure ., Will fix this and will post next patch.

Quoted 222 lines

If an entry is created for channels with SCALE_NONE in DT ., then the corresponding SCALE_* function needs to be implemented by removing SCALE_NONE.

Quoted 220 lines

Quoted 82 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-75~~

 /*
  * The array represents all possible ADC channels found in the supported PMICs.

@@ -630,106 +846,106 @@ struct vadc_channels {
  * gaps in the array should be treated as reserved channels.
  */
 static const struct vadc_channels vadc_chans[] = {
-    VADC_CHAN_VOLT(USBIN, 4)
-    VADC_CHAN_VOLT(DCIN, 4)
-    VADC_CHAN_VOLT(VCHG_SNS, 3)
-    VADC_CHAN_VOLT(SPARE1_03, 1)
-    VADC_CHAN_VOLT(USB_ID_MV, 1)
-    VADC_CHAN_VOLT(VCOIN, 1)
-    VADC_CHAN_VOLT(VBAT_SNS, 1)
-    VADC_CHAN_VOLT(VSYS, 1)
-    VADC_CHAN_TEMP(DIE_TEMP, 0)
-    VADC_CHAN_VOLT(REF_625MV, 0)
-    VADC_CHAN_VOLT(REF_1250MV, 0)
-    VADC_CHAN_VOLT(CHG_TEMP, 0)
-    VADC_CHAN_VOLT(SPARE1, 0)
-    VADC_CHAN_VOLT(SPARE2, 0)
-    VADC_CHAN_VOLT(GND_REF, 0)
-    VADC_CHAN_VOLT(VDD_VADC, 0)
-
-    VADC_CHAN_VOLT(P_MUX1_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX2_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX3_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX4_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX5_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX6_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX7_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX8_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX9_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX10_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX11_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX12_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX13_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX14_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX15_1_1, 0)
-    VADC_CHAN_VOLT(P_MUX16_1_1, 0)
-
-    VADC_CHAN_VOLT(P_MUX1_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX2_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX3_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX4_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX5_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX6_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX7_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX8_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX9_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX10_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX11_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX12_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX13_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX14_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX15_1_3, 1)
-    VADC_CHAN_VOLT(P_MUX16_1_3, 1)
-
-    VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0)
-    VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0)
-    VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0)
-    VADC_CHAN_VOLT(AMUX_PU1, 0)
-    VADC_CHAN_VOLT(AMUX_PU2, 0)
-    VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0)
-
-    VADC_CHAN_VOLT(LR_MUX1_PU1_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_PU1_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_PU1_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_PU1_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_PU1_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_PU1_AMUX_THM4, 0)
-    VADC_CHAN_VOLT(LR_MUX9_PU1_AMUX_THM5, 0)
-    VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0)

drivers/iio/adc/qcom-spmi-vadc.c struct vadc_channels { · line 717

Quoted 10 lines

drivers/iio/adc/qcom-spmi-vadc.c +0 ~~-10~~

-    VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_XO_THERM, 0)
-
-    VADC_CHAN_VOLT(LR_MUX1_PU2_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_PU2_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_PU2_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_PU2_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_PU2_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_PU2_AMUX_THM4, 0)

- VADC_CHAN_VOLT(LR_MUX9_PU2_AMUX_THM5, 0)

Quoted 126 lines

drivers/iio/adc/qcom-spmi-vadc.c +101 ~~-14~~

-    VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_BUF_PU2_XO_THERM, 0)
-
-    VADC_CHAN_VOLT(LR_MUX1_PU1_PU2_BAT_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_PU1_PU2_XO_THERM, 0)
-    VADC_CHAN_VOLT(LR_MUX4_PU1_PU2_AMUX_THM1, 0)
-    VADC_CHAN_VOLT(LR_MUX5_PU1_PU2_AMUX_THM2, 0)
-    VADC_CHAN_VOLT(LR_MUX6_PU1_PU2_AMUX_THM3, 0)
-    VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX8_PU1_PU2_AMUX_THM4, 0)
-    VADC_CHAN_VOLT(LR_MUX9_PU1_PU2_AMUX_THM5, 0)
-    VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0)
-    VADC_CHAN_VOLT(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0)
+    VADC_CHAN_VOLT(USBIN, 4, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(DCIN, 4, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(VCHG_SNS, 3, SCALE_NONE)
+    VADC_CHAN_VOLT(SPARE1_03, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(USB_ID_MV, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(VCOIN, 1, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(VBAT_SNS, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(VSYS, 1, SCALE_DEFAULT)
+    VADC_CHAN_TEMP(DIE_TEMP, 0, SCALE_PMIC_THERM)
+    VADC_CHAN_VOLT(REF_625MV, 0, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(REF_1250MV, 0, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(CHG_TEMP, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(SPARE1, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(SPARE2, 0, SCALE_PMI_CHG_TEMP)
+    VADC_CHAN_VOLT(GND_REF, 0, SCALE_DEFAULT)
+    VADC_CHAN_VOLT(VDD_VADC, 0, SCALE_DEFAULT)
+
+    VADC_CHAN_VOLT(P_MUX1_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX2_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX3_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX4_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX5_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX6_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX7_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX8_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX9_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX10_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX11_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX12_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX13_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX14_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX15_1_1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX16_1_1, 0, SCALE_NONE)
+
+    VADC_CHAN_VOLT(P_MUX1_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX2_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX3_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX4_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX5_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX6_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX7_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX8_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX9_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX10_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX11_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX12_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX13_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX14_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX15_1_3, 1, SCALE_NONE)
+    VADC_CHAN_VOLT(P_MUX16_1_3, 1, SCALE_NONE)
+
+    VADC_CHAN_VOLT(LR_MUX1_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX3_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX4_AMUX_THM1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX5_AMUX_THM2, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX6_AMUX_THM3, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX7_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX8_AMUX_THM4, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX9_AMUX_THM5, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX10_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(AMUX_PU1, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(AMUX_PU2, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX3_BUF_XO_THERM, 0, SCALE_NONE)
+
+    VADC_CHAN_TEMP(LR_MUX1_PU1_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_PU1_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_PU1_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX4_PU1_AMUX_THM1, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_TEMP(LR_MUX5_PU1_AMUX_THM2, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_TEMP(LR_MUX6_PU1_AMUX_THM3, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_VOLT(LR_MUX7_PU1_AMUX_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX8_PU1_AMUX_THM4, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_TEMP(LR_MUX9_PU1_AMUX_THM5, 0, SCALE_THERM_100K_PULLUP)
+    VADC_CHAN_VOLT(LR_MUX10_PU1_AMUX_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_XO_THERM, 0, SCALE_XOTHERM)
+
+    VADC_CHAN_TEMP(LR_MUX1_PU2_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_PU2_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_PU2_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX4_PU2_AMUX_THM1, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX5_PU2_AMUX_THM2, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX6_PU2_AMUX_THM3, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX7_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX8_PU2_AMUX_THM4, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX9_PU2_AMUX_THM5, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX10_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_BUF_PU2_XO_THERM, 0, SCALE_NONE)
+
+    VADC_CHAN_TEMP(LR_MUX1_PU1_PU2_BAT_THERM, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX2_PU1_PU2_BAT_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_PU1_PU2_XO_THERM, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX4_PU1_PU2_AMUX_THM1, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX5_PU1_PU2_AMUX_THM2, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX6_PU1_PU2_AMUX_THM3, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX7_PU1_PU2_AMUX_HW_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX8_PU1_PU2_AMUX_THM4, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX9_PU1_PU2_AMUX_THM5, 0, SCALE_NONE)
+    VADC_CHAN_VOLT(LR_MUX10_PU1_PU2_AMUX_USB_ID, 0, SCALE_NONE)
+    VADC_CHAN_TEMP(LR_MUX3_BUF_PU1_PU2_XO_THERM, 0, SCALE_NONE)
 };
 
 static int vadc_get_dt_channel_data(struct device *dev,

@@ -848,6 +1064,7 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
             return ret;
         }
 
+        prop.scale_fn = vadc_chans[prop.channel].scale_fn;
         vadc->chan_props[index] = prop;
 
         vadc_chan = &vadc_chans[prop.channel];

Quoted 7 lines

Quoted 6 lines
Thanks,
Ramakrishna
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Thanks,
Ramakrishna