[v4,2/3] iio: adc: tsc2046: add vref support

Commit Message

Oleksij Rempel Sept. 2, 2022, 1:13 p.m. UTC

If VREF pin is attached, we should use external VREF source instead of
the internal. Otherwise we will get wrong measurements on some of channel
types.

Signed-off-by: Oleksij Rempel <[e-mail]>
---
changes v4:
- use vref_reg pointer instead of bool use_internal_vref
- move regulator registration to a separate function
- rework error handling
- add devm_add_action_or_reset
---
 drivers/iio/adc/ti-tsc2046.c | 54 ++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

Comments

Andy Shevchenko Sept. 2, 2022, 3:10 p.m. UTC | #1

On Fri, Sep 2, 2022 at 4:19 PM Oleksij Rempel <[e-mail]> wrote:
>
> If VREF pin is attached, we should use external VREF source instead of
> the internal. Otherwise we will get wrong measurements on some of channel

the channel

> types.

Below are minor changes, not sure if you need a new version for that.

...

> +       priv->vref_reg = devm_regulator_get_optional(dev, "vref");

> +       if (IS_ERR(priv->vref_reg) && PTR_ERR(priv->vref_reg) != -ENODEV)
> +               return PTR_ERR(priv->vref_reg);
> +
> +       if (IS_ERR_OR_NULL(priv->vref_reg)) {
> +               priv->vref_reg = NULL;
> +               /* Use internal reference */
> +               priv->vref_mv = TI_TSC2046_INT_VREF;
> +               return 0;
> +       }

This can be refactored now

       if (IS_ERR(priv->vref_reg)) {
           /* If regulator exists but can't be get, return an error */
           if (PTR_ERR(priv->vref_reg) != -ENODEV)
               return PTR_ERR(priv->vref_reg);
           priv->vref_reg = NULL;
       }
       if (!priv->vref_reg) {
               /* Use internal reference */
               priv->vref_mv = TI_TSC2046_INT_VREF;
               return 0;
       }

...

> +       ret = devm_add_action_or_reset(dev, tsc2046_adc_regulator_disable,
> +                                      priv);

I believe it's fine to be on one line.

> +       if (ret)
> +               return ret;

...

> +       priv->vref_mv = ret / 1000;

MILLI?

Patch

diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c
index 0d9436a69cbfb..5f92754e066be 100644
--- a/drivers/iio/adc/ti-tsc2046.c
+++ b/drivers/iio/adc/ti-tsc2046.c
@@ -8,6 +8,7 @@ 
 #include <linux/bitfield.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 
 #include <asm/unaligned.h>
@@ -175,6 +176,8 @@  struct tsc2046_adc_priv {
 	u32 time_per_bit_ns;
 
 	struct tsc2046_adc_ch_cfg ch_cfg[TI_TSC2046_MAX_CHAN];
+	unsigned int vref_mv;
+	struct regulator *vref_reg;
 };
 
 #define TI_TSC2046_V_CHAN(index, bits, name)			\
@@ -252,7 +255,9 @@  static u8 tsc2046_adc_get_cmd(struct tsc2046_adc_priv *priv, int ch_idx,
 	case TI_TSC2046_ADDR_AUX:
 	case TI_TSC2046_ADDR_VBAT:
 	case TI_TSC2046_ADDR_TEMP0:
-		pd |= TI_TSC2046_SER | TI_TSC2046_PD1_VREF_ON;
+		pd |= TI_TSC2046_SER;
+		if (!priv->vref_reg)
+			pd |= TI_TSC2046_PD1_VREF_ON;
 	}
 
 	return TI_TSC2046_START | FIELD_PREP(TI_TSC2046_ADDR, ch_idx) | pd;
@@ -468,7 +473,7 @@  static int tsc2046_adc_read_raw(struct iio_dev *indio_dev,
 		 * So, it is better to use external voltage-divider driver
 		 * instead, which is calculating complete chain.
 		 */
-		*val = TI_TSC2046_INT_VREF;
+		*val = priv->vref_mv;
 		*val2 = chan->scan_type.realbits;
 		return IIO_VAL_FRACTIONAL_LOG2;
 	}
@@ -740,6 +745,47 @@  static void tsc2046_adc_parse_fwnode(struct tsc2046_adc_priv *priv)
 	}
 }
 
+static void tsc2046_adc_regulator_disable(void *data)
+{
+	struct tsc2046_adc_priv *priv = data;
+
+	regulator_disable(priv->vref_reg);
+}
+
+static int tsc2046_adc_configure_regulator(struct tsc2046_adc_priv *priv)
+{
+	struct device *dev = &priv->spi->dev;
+	int ret;
+
+	priv->vref_reg = devm_regulator_get_optional(dev, "vref");
+	if (IS_ERR(priv->vref_reg) && PTR_ERR(priv->vref_reg) != -ENODEV)
+		return PTR_ERR(priv->vref_reg);
+
+	if (IS_ERR_OR_NULL(priv->vref_reg)) {
+		priv->vref_reg = NULL;
+		/* Use internal reference */
+		priv->vref_mv = TI_TSC2046_INT_VREF;
+		return 0;
+	}
+
+	ret = regulator_enable(priv->vref_reg);
+	if (ret)
+		return ret;
+
+	ret = devm_add_action_or_reset(dev, tsc2046_adc_regulator_disable,
+				       priv);
+	if (ret)
+		return ret;
+
+	ret = regulator_get_voltage(priv->vref_reg);
+	if (ret < 0)
+		return ret;
+
+	priv->vref_mv = ret / 1000;
+
+	return 0;
+}
+
 static int tsc2046_adc_probe(struct spi_device *spi)
 {
 	const struct tsc2046_adc_dcfg *dcfg;
@@ -781,6 +827,10 @@  static int tsc2046_adc_probe(struct spi_device *spi)
 	indio_dev->num_channels = dcfg->num_channels;
 	indio_dev->info = &tsc2046_adc_info;
 
+	ret = tsc2046_adc_configure_regulator(priv);
+	if (ret)
+		return ret;
+
 	tsc2046_adc_parse_fwnode(priv);
 
 	ret = tsc2046_adc_setup_spi_msg(priv);