[PATCH v2 0/5] iio: adc: ad7380: fix several supplies issues

[PATCH v2 0/5] iio: adc: ad7380: fix several supplies issues

[Julien Stephan]

Hello,

This series tries to fix several issues found on the ad7380 driver about
supplies:

- vcc and vlogic are required, but are not retrieved and enabled in the
probe function
- ad7380-4 is the only device from the family that does not have internal
reference and uses REFIN instead of REFIO for external reference.

driver, bindings, and doc are fixed accordingly

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
Changes in v2:
- Fix kernel test robot warning about variable uninitialized when used [1]
- drop commit removing supply description in bindings
- after discussion on [2] we decided to add refin supply here, as it
  will be needed in the futur

- Link to v1: https://lore.kernel.org/r/20241007-ad7380-fix-supplies-v1-0-badcf813c9b9@baylibre.com

[1] https://lore.kernel.org/oe-kbuild-all/202410081608.ZxEPPZ0u-lkp@intel.com/
[2] https://lore.kernel.org/all/20241015-ad7380-add-adaq4380-4-support-v1-0-d2e1a95fb248@baylibre.com/:warning

---
Julien Stephan (5):
      dt-bindings: iio: adc: ad7380: fix ad7380-4 reference supply
      iio: adc: ad7380: use devm_regulator_get_enable_read_voltage()
      iio: adc: ad7380: add missing supplies
      iio: adc: ad7380: fix supplies for ad7380-4
      docs: iio: ad7380: fix supply for ad7380-4

 .../devicetree/bindings/iio/adc/adi,ad7380.yaml    |  21 ++++
 Documentation/iio/ad7380.rst                       |  13 +-
 drivers/iio/adc/ad7380.c                           | 136 ++++++++++++---------
 3 files changed, 110 insertions(+), 60 deletions(-)
---
base-commit: 1a8b58362f6a6fef975032f7fceb7c4b80d20d60
change-id: 20241004-ad7380-fix-supplies-3677365cf8aa

Best regards,
-- 
Julien Stephan <jstephan@baylibre.com>

[PATCH v2 1/5] dt-bindings: iio: adc: ad7380: fix ad7380-4 reference supply

[Julien Stephan]

ad7380-4 is the only device from ad738x family that doesn't have an
internal reference. Moreover its external reference is called REFIN in
the datasheet while all other use REFIO as an optional external
reference. If refio-supply is omitted the internal reference is
used.

Fix the binding by adding refin-supply and makes it required for
ad7380-4 only.

Fixes: 1a291cc8ee17 ("dt-bindings: iio: adc: ad7380: add support for ad738x-4 4 channels variants")
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 .../devicetree/bindings/iio/adc/adi,ad7380.yaml     | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml
index bd19abb867d98d46bdd1c9e0c197e10f06979204..0065d650882489e21b952bb9fb25f1e3a070ee68 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml
@@ -67,6 +67,10 @@ properties:
       A 2.5V to 3.3V supply for the external reference voltage. When omitted,
       the internal 2.5V reference is used.
 
+  refin-supply:
+    description:
+      A 2.5V to 3.3V supply for external reference voltage, for ad7380-4 only.
+
   aina-supply:
     description:
       The common mode voltage supply for the AINA- pin on pseudo-differential
@@ -135,6 +139,23 @@ allOf:
         ainc-supply: false
         aind-supply: false
 
+  # ad7380-4 uses refin-supply as external reference.
+  # All other chips from ad738x family use refio as optional external reference.
+  # When refio-supply is omitted, internal reference is used.
+  - if:
+      properties:
+        compatible:
+          enum:
+            - adi,ad7380-4
+    then:
+      properties:
+        refio-supply: false
+      required:
+        - refin-supply
+    else:
+      properties:
+        refin-supply: false
+
 examples:
   - |
     #include <dt-bindings/interrupt-controller/irq.h>

-- 
2.47.0

[PATCH v2 2/5] iio: adc: ad7380: use devm_regulator_get_enable_read_voltage()

[Julien Stephan]

Use devm_regulator_get_enable_read_voltage() to simplify the code.

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 drivers/iio/adc/ad7380.c | 81 +++++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 60 deletions(-)

diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
index e8bddfb0d07dbcf3e2a43344a4e0516f4d617548..e033c734191143a25a490b09c730dbf95f796737 100644
--- a/drivers/iio/adc/ad7380.c
+++ b/drivers/iio/adc/ad7380.c
@@ -956,7 +956,7 @@ static const struct iio_info ad7380_info = {
 	.debugfs_reg_access = &ad7380_debugfs_reg_access,
 };
 
-static int ad7380_init(struct ad7380_state *st, struct regulator *vref)
+static int ad7380_init(struct ad7380_state *st, bool external_ref_en)
 {
 	int ret;
 
@@ -968,13 +968,13 @@ static int ad7380_init(struct ad7380_state *st, struct regulator *vref)
 	if (ret < 0)
 		return ret;
 
-	/* select internal or external reference voltage */
-	ret = regmap_update_bits(st->regmap, AD7380_REG_ADDR_CONFIG1,
-				 AD7380_CONFIG1_REFSEL,
-				 FIELD_PREP(AD7380_CONFIG1_REFSEL,
-					    vref ? 1 : 0));
-	if (ret < 0)
-		return ret;
+	if (external_ref_en) {
+		/* select external reference voltage */
+		ret = regmap_set_bits(st->regmap, AD7380_REG_ADDR_CONFIG1,
+				      AD7380_CONFIG1_REFSEL);
+		if (ret < 0)
+			return ret;
+	}
 
 	/* This is the default value after reset. */
 	st->oversampling_ratio = 1;
@@ -987,16 +987,11 @@ static int ad7380_init(struct ad7380_state *st, struct regulator *vref)
 				  FIELD_PREP(AD7380_CONFIG2_SDO, 1));
 }
 
-static void ad7380_regulator_disable(void *p)
-{
-	regulator_disable(p);
-}
-
 static int ad7380_probe(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev;
 	struct ad7380_state *st;
-	struct regulator *vref;
+	bool external_ref_en;
 	int ret, i;
 
 	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
@@ -1009,37 +1004,17 @@ static int ad7380_probe(struct spi_device *spi)
 	if (!st->chip_info)
 		return dev_err_probe(&spi->dev, -EINVAL, "missing match data\n");
 
-	vref = devm_regulator_get_optional(&spi->dev, "refio");
-	if (IS_ERR(vref)) {
-		if (PTR_ERR(vref) != -ENODEV)
-			return dev_err_probe(&spi->dev, PTR_ERR(vref),
-					     "Failed to get refio regulator\n");
-
-		vref = NULL;
-	}
-
 	/*
 	 * If there is no REFIO supply, then it means that we are using
 	 * the internal 2.5V reference, otherwise REFIO is reference voltage.
 	 */
-	if (vref) {
-		ret = regulator_enable(vref);
-		if (ret)
-			return ret;
+	ret = devm_regulator_get_enable_read_voltage(&spi->dev, "refio");
+	if (ret < 0 && ret != -ENODEV)
+		return dev_err_probe(&spi->dev, ret,
+				     "Failed to get refio regulator\n");
 
-		ret = devm_add_action_or_reset(&spi->dev,
-					       ad7380_regulator_disable, vref);
-		if (ret)
-			return ret;
-
-		ret = regulator_get_voltage(vref);
-		if (ret < 0)
-			return ret;
-
-		st->vref_mv = ret / 1000;
-	} else {
-		st->vref_mv = AD7380_INTERNAL_REF_MV;
-	}
+	external_ref_en = ret != -ENODEV;
+	st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
 
 	if (st->chip_info->num_vcm_supplies > ARRAY_SIZE(st->vcm_mv))
 		return dev_err_probe(&spi->dev, -EINVAL,
@@ -1050,27 +1025,13 @@ static int ad7380_probe(struct spi_device *spi)
 	 * input pin.
 	 */
 	for (i = 0; i < st->chip_info->num_vcm_supplies; i++) {
-		struct regulator *vcm;
-
-		vcm = devm_regulator_get(&spi->dev,
-					 st->chip_info->vcm_supplies[i]);
-		if (IS_ERR(vcm))
-			return dev_err_probe(&spi->dev, PTR_ERR(vcm),
-					     "Failed to get %s regulator\n",
-					     st->chip_info->vcm_supplies[i]);
+		const char *vcm = st->chip_info->vcm_supplies[i];
 
-		ret = regulator_enable(vcm);
-		if (ret)
-			return ret;
-
-		ret = devm_add_action_or_reset(&spi->dev,
-					       ad7380_regulator_disable, vcm);
-		if (ret)
-			return ret;
-
-		ret = regulator_get_voltage(vcm);
+		ret = devm_regulator_get_enable_read_voltage(&spi->dev, vcm);
 		if (ret < 0)
-			return ret;
+			return dev_err_probe(&spi->dev, ret,
+					     "Failed to get %s regulator\n",
+					     vcm);
 
 		st->vcm_mv[i] = ret / 1000;
 	}
@@ -1135,7 +1096,7 @@ static int ad7380_probe(struct spi_device *spi)
 	if (ret)
 		return ret;
 
-	ret = ad7380_init(st, vref);
+	ret = ad7380_init(st, external_ref_en);
 	if (ret)
 		return ret;
 

-- 
2.47.0

[PATCH v2 3/5] iio: adc: ad7380: add missing supplies

[Julien Stephan]

vcc and vlogic are required but are not retrieved and enabled in the
probe. Add them.

In order to prepare support for additional parts requiring different
supplies, add vcc and vlogic to the platform specific structures

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 drivers/iio/adc/ad7380.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
index e033c734191143a25a490b09c730dbf95f796737..e257f78d63edd7910fcb936ec5344922f8e70b99 100644
--- a/drivers/iio/adc/ad7380.c
+++ b/drivers/iio/adc/ad7380.c
@@ -75,6 +75,7 @@
 #define T_CONVERT_NS 190		/* conversion time */
 #define T_CONVERT_0_NS 10		/* 1st conversion start time (oversampling) */
 #define T_CONVERT_X_NS 500		/* xth conversion start time (oversampling) */
+#define T_POWERUP_MS 5			/* Power up */
 
 struct ad7380_timing_specs {
 	const unsigned int t_csh_ns;	/* CS minimum high time */
@@ -86,6 +87,8 @@ struct ad7380_chip_info {
 	unsigned int num_channels;
 	unsigned int num_simult_channels;
 	bool has_mux;
+	const char * const *supplies;
+	unsigned int num_supplies;
 	const char * const *vcm_supplies;
 	unsigned int num_vcm_supplies;
 	const unsigned long *available_scan_masks;
@@ -243,6 +246,10 @@ DEFINE_AD7380_8_CHANNEL(ad7386_4_channels, 16, 0, u);
 DEFINE_AD7380_8_CHANNEL(ad7387_4_channels, 14, 0, u);
 DEFINE_AD7380_8_CHANNEL(ad7388_4_channels, 12, 0, u);
 
+static const char * const ad7380_supplies[] = {
+	"vcc", "vlogic",
+};
+
 static const char * const ad7380_2_channel_vcm_supplies[] = {
 	"aina", "ainb",
 };
@@ -338,6 +345,8 @@ static const struct ad7380_chip_info ad7380_chip_info = {
 	.channels = ad7380_channels,
 	.num_channels = ARRAY_SIZE(ad7380_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.available_scan_masks = ad7380_2_channel_scan_masks,
 	.timing_specs = &ad7380_timing,
 };
@@ -347,6 +356,8 @@ static const struct ad7380_chip_info ad7381_chip_info = {
 	.channels = ad7381_channels,
 	.num_channels = ARRAY_SIZE(ad7381_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.available_scan_masks = ad7380_2_channel_scan_masks,
 	.timing_specs = &ad7380_timing,
 };
@@ -356,6 +367,8 @@ static const struct ad7380_chip_info ad7383_chip_info = {
 	.channels = ad7383_channels,
 	.num_channels = ARRAY_SIZE(ad7383_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.vcm_supplies = ad7380_2_channel_vcm_supplies,
 	.num_vcm_supplies = ARRAY_SIZE(ad7380_2_channel_vcm_supplies),
 	.available_scan_masks = ad7380_2_channel_scan_masks,
@@ -367,6 +380,8 @@ static const struct ad7380_chip_info ad7384_chip_info = {
 	.channels = ad7384_channels,
 	.num_channels = ARRAY_SIZE(ad7384_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.vcm_supplies = ad7380_2_channel_vcm_supplies,
 	.num_vcm_supplies = ARRAY_SIZE(ad7380_2_channel_vcm_supplies),
 	.available_scan_masks = ad7380_2_channel_scan_masks,
@@ -378,6 +393,8 @@ static const struct ad7380_chip_info ad7386_chip_info = {
 	.channels = ad7386_channels,
 	.num_channels = ARRAY_SIZE(ad7386_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.has_mux = true,
 	.available_scan_masks = ad7380_2x2_channel_scan_masks,
 	.timing_specs = &ad7380_timing,
@@ -388,6 +405,8 @@ static const struct ad7380_chip_info ad7387_chip_info = {
 	.channels = ad7387_channels,
 	.num_channels = ARRAY_SIZE(ad7387_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.has_mux = true,
 	.available_scan_masks = ad7380_2x2_channel_scan_masks,
 	.timing_specs = &ad7380_timing,
@@ -398,6 +417,8 @@ static const struct ad7380_chip_info ad7388_chip_info = {
 	.channels = ad7388_channels,
 	.num_channels = ARRAY_SIZE(ad7388_channels),
 	.num_simult_channels = 2,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.has_mux = true,
 	.available_scan_masks = ad7380_2x2_channel_scan_masks,
 	.timing_specs = &ad7380_timing,
@@ -408,6 +429,8 @@ static const struct ad7380_chip_info ad7380_4_chip_info = {
 	.channels = ad7380_4_channels,
 	.num_channels = ARRAY_SIZE(ad7380_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.available_scan_masks = ad7380_4_channel_scan_masks,
 	.timing_specs = &ad7380_4_timing,
 };
@@ -417,6 +440,8 @@ static const struct ad7380_chip_info ad7381_4_chip_info = {
 	.channels = ad7381_4_channels,
 	.num_channels = ARRAY_SIZE(ad7381_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.available_scan_masks = ad7380_4_channel_scan_masks,
 	.timing_specs = &ad7380_4_timing,
 };
@@ -426,6 +451,8 @@ static const struct ad7380_chip_info ad7383_4_chip_info = {
 	.channels = ad7383_4_channels,
 	.num_channels = ARRAY_SIZE(ad7383_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.vcm_supplies = ad7380_4_channel_vcm_supplies,
 	.num_vcm_supplies = ARRAY_SIZE(ad7380_4_channel_vcm_supplies),
 	.available_scan_masks = ad7380_4_channel_scan_masks,
@@ -437,6 +464,8 @@ static const struct ad7380_chip_info ad7384_4_chip_info = {
 	.channels = ad7384_4_channels,
 	.num_channels = ARRAY_SIZE(ad7384_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.vcm_supplies = ad7380_4_channel_vcm_supplies,
 	.num_vcm_supplies = ARRAY_SIZE(ad7380_4_channel_vcm_supplies),
 	.available_scan_masks = ad7380_4_channel_scan_masks,
@@ -448,6 +477,8 @@ static const struct ad7380_chip_info ad7386_4_chip_info = {
 	.channels = ad7386_4_channels,
 	.num_channels = ARRAY_SIZE(ad7386_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.has_mux = true,
 	.available_scan_masks = ad7380_2x4_channel_scan_masks,
 	.timing_specs = &ad7380_4_timing,
@@ -458,6 +489,8 @@ static const struct ad7380_chip_info ad7387_4_chip_info = {
 	.channels = ad7387_4_channels,
 	.num_channels = ARRAY_SIZE(ad7387_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.has_mux = true,
 	.available_scan_masks = ad7380_2x4_channel_scan_masks,
 	.timing_specs = &ad7380_4_timing,
@@ -468,6 +501,8 @@ static const struct ad7380_chip_info ad7388_4_chip_info = {
 	.channels = ad7388_4_channels,
 	.num_channels = ARRAY_SIZE(ad7388_4_channels),
 	.num_simult_channels = 4,
+	.supplies = ad7380_supplies,
+	.num_supplies = ARRAY_SIZE(ad7380_supplies),
 	.has_mux = true,
 	.available_scan_masks = ad7380_2x4_channel_scan_masks,
 	.timing_specs = &ad7380_4_timing,
@@ -1004,6 +1039,14 @@ static int ad7380_probe(struct spi_device *spi)
 	if (!st->chip_info)
 		return dev_err_probe(&spi->dev, -EINVAL, "missing match data\n");
 
+	ret = devm_regulator_bulk_get_enable(&spi->dev, st->chip_info->num_supplies,
+					     st->chip_info->supplies);
+
+	if (ret)
+		return dev_err_probe(&spi->dev, ret,
+				     "Failed to enable power supplies\n");
+	msleep(T_POWERUP_MS);
+
 	/*
 	 * If there is no REFIO supply, then it means that we are using
 	 * the internal 2.5V reference, otherwise REFIO is reference voltage.

-- 
2.47.0

[PATCH v2 4/5] iio: adc: ad7380: fix supplies for ad7380-4

[Julien Stephan]

ad7380-4 is the only device in the family that does not have an internal
reference. It uses "refin" as a required external reference.
All other devices in the family use "refio"" as an optional external
reference.

Fixes: 737413da8704 ("iio: adc: ad7380: add support for ad738x-4 4 channels variants")
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 drivers/iio/adc/ad7380.c | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
index e257f78d63edd7910fcb936ec5344922f8e70b99..65096717f0dd3ea6a4ff7020bc544d62b84cb8fd 100644
--- a/drivers/iio/adc/ad7380.c
+++ b/drivers/iio/adc/ad7380.c
@@ -89,6 +89,7 @@ struct ad7380_chip_info {
 	bool has_mux;
 	const char * const *supplies;
 	unsigned int num_supplies;
+	bool external_ref_only;
 	const char * const *vcm_supplies;
 	unsigned int num_vcm_supplies;
 	const unsigned long *available_scan_masks;
@@ -431,6 +432,7 @@ static const struct ad7380_chip_info ad7380_4_chip_info = {
 	.num_simult_channels = 4,
 	.supplies = ad7380_supplies,
 	.num_supplies = ARRAY_SIZE(ad7380_supplies),
+	.external_ref_only = true,
 	.available_scan_masks = ad7380_4_channel_scan_masks,
 	.timing_specs = &ad7380_4_timing,
 };
@@ -1047,17 +1049,31 @@ static int ad7380_probe(struct spi_device *spi)
 				     "Failed to enable power supplies\n");
 	msleep(T_POWERUP_MS);
 
-	/*
-	 * If there is no REFIO supply, then it means that we are using
-	 * the internal 2.5V reference, otherwise REFIO is reference voltage.
-	 */
-	ret = devm_regulator_get_enable_read_voltage(&spi->dev, "refio");
-	if (ret < 0 && ret != -ENODEV)
-		return dev_err_probe(&spi->dev, ret,
-				     "Failed to get refio regulator\n");
+	if (st->chip_info->external_ref_only) {
+		ret = devm_regulator_get_enable_read_voltage(&spi->dev,
+							     "refin");
+		if (ret < 0)
+			return dev_err_probe(&spi->dev, ret,
+					     "Failed to get refin regulator\n");
+
+		st->vref_mv = ret / 1000;
 
-	external_ref_en = ret != -ENODEV;
-	st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
+		/* these chips don't have a register bit for this */
+		external_ref_en = false;
+	} else {
+		/*
+		 * If there is no REFIO supply, then it means that we are using
+		 * the internal reference, otherwise REFIO is reference voltage.
+		 */
+		ret = devm_regulator_get_enable_read_voltage(&spi->dev,
+							     "refio");
+		if (ret < 0 && ret != -ENODEV)
+			return dev_err_probe(&spi->dev, ret,
+					     "Failed to get refio regulator\n");
+
+		external_ref_en = ret != -ENODEV;
+		st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
+	}
 
 	if (st->chip_info->num_vcm_supplies > ARRAY_SIZE(st->vcm_mv))
 		return dev_err_probe(&spi->dev, -EINVAL,

-- 
2.47.0

[PATCH v2 5/5] docs: iio: ad7380: fix supply for ad7380-4

[Julien Stephan]

ad7380-4 is the only device from ad738x family that doesn't have an
internal reference. Moreover it's external reference is called REFIN in
the datasheet while all other use REFIO as an optional external
reference. Update documentation to highlight this.

Fixes: 3e82dfc82f38 ("docs: iio: new docs for ad7380 driver")
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 Documentation/iio/ad7380.rst | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Documentation/iio/ad7380.rst b/Documentation/iio/ad7380.rst
index 9c784c1e652e9afc116fd206a6cdb70fa6e2adf0..6f70b49b9ef27c1ac32acaefecd1146e5c8bd6cc 100644
--- a/Documentation/iio/ad7380.rst
+++ b/Documentation/iio/ad7380.rst
@@ -41,13 +41,22 @@ supports only 1 SDO line.
 Reference voltage
 -----------------
 
-2 possible reference voltage sources are supported:
+ad7380-4
+~~~~~~~~
+
+ad7380-4 supports only an external reference voltage (2.5V to 3.3V). It must be
+declared in the device tree as ``refin-supply``.
+
+All other devices from ad738x family
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All other devices from ad738x support 2 possible reference voltage sources:
 
 - Internal reference (2.5V)
 - External reference (2.5V to 3.3V)
 
 The source is determined by the device tree. If ``refio-supply`` is present,
-then the external reference is used, else the internal reference is used.
+then it is used as external reference, else the internal reference is used.
 
 Oversampling and resolution boost
 ---------------------------------

-- 
2.47.0

Re: [PATCH v2 2/5] iio: adc: ad7380: use devm_regulator_get_enable_read_voltage()

[Nuno Sá]

On Mon, 2024-10-21 at 12:00 +0200, Julien Stephan wrote:
> Use devm_regulator_get_enable_read_voltage() to simplify the code.
> 
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> ---

LGTM,

Reviewed-by: Nuno Sa <nuno.sa@analog.com>

>  drivers/iio/adc/ad7380.c | 81 +++++++++++++----------------------------------
> -
>  1 file changed, 21 insertions(+), 60 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
> index
> e8bddfb0d07dbcf3e2a43344a4e0516f4d617548..e033c734191143a25a490b09c730dbf95f79
> 6737 100644
> --- a/drivers/iio/adc/ad7380.c
> +++ b/drivers/iio/adc/ad7380.c
> @@ -956,7 +956,7 @@ static const struct iio_info ad7380_info = {
>  	.debugfs_reg_access = &ad7380_debugfs_reg_access,
>  };
>  
> -static int ad7380_init(struct ad7380_state *st, struct regulator *vref)
> +static int ad7380_init(struct ad7380_state *st, bool external_ref_en)
>  {
>  	int ret;
>  
> @@ -968,13 +968,13 @@ static int ad7380_init(struct ad7380_state *st, struct
> regulator *vref)
>  	if (ret < 0)
>  		return ret;
>  
> -	/* select internal or external reference voltage */
> -	ret = regmap_update_bits(st->regmap, AD7380_REG_ADDR_CONFIG1,
> -				 AD7380_CONFIG1_REFSEL,
> -				 FIELD_PREP(AD7380_CONFIG1_REFSEL,
> -					    vref ? 1 : 0));
> -	if (ret < 0)
> -		return ret;
> +	if (external_ref_en) {
> +		/* select external reference voltage */
> +		ret = regmap_set_bits(st->regmap, AD7380_REG_ADDR_CONFIG1,
> +				      AD7380_CONFIG1_REFSEL);
> +		if (ret < 0)
> +			return ret;
> +	}
>  
>  	/* This is the default value after reset. */
>  	st->oversampling_ratio = 1;
> @@ -987,16 +987,11 @@ static int ad7380_init(struct ad7380_state *st, struct
> regulator *vref)
>  				  FIELD_PREP(AD7380_CONFIG2_SDO, 1));
>  }
>  
> -static void ad7380_regulator_disable(void *p)
> -{
> -	regulator_disable(p);
> -}
> -
>  static int ad7380_probe(struct spi_device *spi)
>  {
>  	struct iio_dev *indio_dev;
>  	struct ad7380_state *st;
> -	struct regulator *vref;
> +	bool external_ref_en;
>  	int ret, i;
>  
>  	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> @@ -1009,37 +1004,17 @@ static int ad7380_probe(struct spi_device *spi)
>  	if (!st->chip_info)
>  		return dev_err_probe(&spi->dev, -EINVAL, "missing match
> data\n");
>  
> -	vref = devm_regulator_get_optional(&spi->dev, "refio");
> -	if (IS_ERR(vref)) {
> -		if (PTR_ERR(vref) != -ENODEV)
> -			return dev_err_probe(&spi->dev, PTR_ERR(vref),
> -					     "Failed to get refio
> regulator\n");
> -
> -		vref = NULL;
> -	}
> -
>  	/*
>  	 * If there is no REFIO supply, then it means that we are using
>  	 * the internal 2.5V reference, otherwise REFIO is reference voltage.
>  	 */
> -	if (vref) {
> -		ret = regulator_enable(vref);
> -		if (ret)
> -			return ret;
> +	ret = devm_regulator_get_enable_read_voltage(&spi->dev, "refio");
> +	if (ret < 0 && ret != -ENODEV)
> +		return dev_err_probe(&spi->dev, ret,
> +				     "Failed to get refio regulator\n");
>  
> -		ret = devm_add_action_or_reset(&spi->dev,
> -					       ad7380_regulator_disable,
> vref);
> -		if (ret)
> -			return ret;
> -
> -		ret = regulator_get_voltage(vref);
> -		if (ret < 0)
> -			return ret;
> -
> -		st->vref_mv = ret / 1000;
> -	} else {
> -		st->vref_mv = AD7380_INTERNAL_REF_MV;
> -	}
> +	external_ref_en = ret != -ENODEV;
> +	st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
>  
>  	if (st->chip_info->num_vcm_supplies > ARRAY_SIZE(st->vcm_mv))
>  		return dev_err_probe(&spi->dev, -EINVAL,
> @@ -1050,27 +1025,13 @@ static int ad7380_probe(struct spi_device *spi)
>  	 * input pin.
>  	 */
>  	for (i = 0; i < st->chip_info->num_vcm_supplies; i++) {
> -		struct regulator *vcm;
> -
> -		vcm = devm_regulator_get(&spi->dev,
> -					 st->chip_info->vcm_supplies[i]);
> -		if (IS_ERR(vcm))
> -			return dev_err_probe(&spi->dev, PTR_ERR(vcm),
> -					     "Failed to get %s regulator\n",
> -					     st->chip_info->vcm_supplies[i]);
> +		const char *vcm = st->chip_info->vcm_supplies[i];
>  
> -		ret = regulator_enable(vcm);
> -		if (ret)
> -			return ret;
> -
> -		ret = devm_add_action_or_reset(&spi->dev,
> -					       ad7380_regulator_disable,
> vcm);
> -		if (ret)
> -			return ret;
> -
> -		ret = regulator_get_voltage(vcm);
> +		ret = devm_regulator_get_enable_read_voltage(&spi->dev, vcm);
>  		if (ret < 0)
> -			return ret;
> +			return dev_err_probe(&spi->dev, ret,
> +					     "Failed to get %s regulator\n",
> +					     vcm);
>  
>  		st->vcm_mv[i] = ret / 1000;
>  	}
> @@ -1135,7 +1096,7 @@ static int ad7380_probe(struct spi_device *spi)
>  	if (ret)
>  		return ret;
>  
> -	ret = ad7380_init(st, vref);
> +	ret = ad7380_init(st, external_ref_en);
>  	if (ret)
>  		return ret;
>  
> 

Re: [PATCH v2 3/5] iio: adc: ad7380: add missing supplies

[Nuno Sá]

On Mon, 2024-10-21 at 12:00 +0200, Julien Stephan wrote:
> vcc and vlogic are required but are not retrieved and enabled in the
> probe. Add them.
> 
> In order to prepare support for additional parts requiring different
> supplies, add vcc and vlogic to the platform specific structures
> 
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> ---

One small not below... With that,

Reviewed-by: Nuno Sa <nuno.sa@analog.com>

>  drivers/iio/adc/ad7380.c | 43 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
> index
> e033c734191143a25a490b09c730dbf95f796737..e257f78d63edd7910fcb936ec5344922f8e7
> 0b99 100644
> --- a/drivers/iio/adc/ad7380.c
> +++ b/drivers/iio/adc/ad7380.c
> @@ -75,6 +75,7 @@
>  #define T_CONVERT_NS 190		/* conversion time */
>  #define T_CONVERT_0_NS 10		/* 1st conversion start time
> (oversampling) */
>  #define T_CONVERT_X_NS 500		/* xth conversion start time
> (oversampling) */
> +#define T_POWERUP_MS 5			/* Power up */
>  
>  struct ad7380_timing_specs {
>  	const unsigned int t_csh_ns;	/* CS minimum high time */
> @@ -86,6 +87,8 @@ struct ad7380_chip_info {
>  	unsigned int num_channels;
>  	unsigned int num_simult_channels;
>  	bool has_mux;
> +	const char * const *supplies;
> +	unsigned int num_supplies;
>  	const char * const *vcm_supplies;
>  	unsigned int num_vcm_supplies;
>  	const unsigned long *available_scan_masks;
> @@ -243,6 +246,10 @@ DEFINE_AD7380_8_CHANNEL(ad7386_4_channels, 16, 0, u);
>  DEFINE_AD7380_8_CHANNEL(ad7387_4_channels, 14, 0, u);
>  DEFINE_AD7380_8_CHANNEL(ad7388_4_channels, 12, 0, u);
>  
> +static const char * const ad7380_supplies[] = {
> +	"vcc", "vlogic",
> +};
> +
>  static const char * const ad7380_2_channel_vcm_supplies[] = {
>  	"aina", "ainb",
>  };
> @@ -338,6 +345,8 @@ static const struct ad7380_chip_info ad7380_chip_info = {
>  	.channels = ad7380_channels,
>  	.num_channels = ARRAY_SIZE(ad7380_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.available_scan_masks = ad7380_2_channel_scan_masks,
>  	.timing_specs = &ad7380_timing,
>  };
> @@ -347,6 +356,8 @@ static const struct ad7380_chip_info ad7381_chip_info = {
>  	.channels = ad7381_channels,
>  	.num_channels = ARRAY_SIZE(ad7381_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.available_scan_masks = ad7380_2_channel_scan_masks,
>  	.timing_specs = &ad7380_timing,
>  };
> @@ -356,6 +367,8 @@ static const struct ad7380_chip_info ad7383_chip_info = {
>  	.channels = ad7383_channels,
>  	.num_channels = ARRAY_SIZE(ad7383_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.vcm_supplies = ad7380_2_channel_vcm_supplies,
>  	.num_vcm_supplies = ARRAY_SIZE(ad7380_2_channel_vcm_supplies),
>  	.available_scan_masks = ad7380_2_channel_scan_masks,
> @@ -367,6 +380,8 @@ static const struct ad7380_chip_info ad7384_chip_info = {
>  	.channels = ad7384_channels,
>  	.num_channels = ARRAY_SIZE(ad7384_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.vcm_supplies = ad7380_2_channel_vcm_supplies,
>  	.num_vcm_supplies = ARRAY_SIZE(ad7380_2_channel_vcm_supplies),
>  	.available_scan_masks = ad7380_2_channel_scan_masks,
> @@ -378,6 +393,8 @@ static const struct ad7380_chip_info ad7386_chip_info = {
>  	.channels = ad7386_channels,
>  	.num_channels = ARRAY_SIZE(ad7386_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.has_mux = true,
>  	.available_scan_masks = ad7380_2x2_channel_scan_masks,
>  	.timing_specs = &ad7380_timing,
> @@ -388,6 +405,8 @@ static const struct ad7380_chip_info ad7387_chip_info = {
>  	.channels = ad7387_channels,
>  	.num_channels = ARRAY_SIZE(ad7387_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.has_mux = true,
>  	.available_scan_masks = ad7380_2x2_channel_scan_masks,
>  	.timing_specs = &ad7380_timing,
> @@ -398,6 +417,8 @@ static const struct ad7380_chip_info ad7388_chip_info = {
>  	.channels = ad7388_channels,
>  	.num_channels = ARRAY_SIZE(ad7388_channels),
>  	.num_simult_channels = 2,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.has_mux = true,
>  	.available_scan_masks = ad7380_2x2_channel_scan_masks,
>  	.timing_specs = &ad7380_timing,
> @@ -408,6 +429,8 @@ static const struct ad7380_chip_info ad7380_4_chip_info =
> {
>  	.channels = ad7380_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7380_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.available_scan_masks = ad7380_4_channel_scan_masks,
>  	.timing_specs = &ad7380_4_timing,
>  };
> @@ -417,6 +440,8 @@ static const struct ad7380_chip_info ad7381_4_chip_info =
> {
>  	.channels = ad7381_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7381_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.available_scan_masks = ad7380_4_channel_scan_masks,
>  	.timing_specs = &ad7380_4_timing,
>  };
> @@ -426,6 +451,8 @@ static const struct ad7380_chip_info ad7383_4_chip_info =
> {
>  	.channels = ad7383_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7383_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.vcm_supplies = ad7380_4_channel_vcm_supplies,
>  	.num_vcm_supplies = ARRAY_SIZE(ad7380_4_channel_vcm_supplies),
>  	.available_scan_masks = ad7380_4_channel_scan_masks,
> @@ -437,6 +464,8 @@ static const struct ad7380_chip_info ad7384_4_chip_info =
> {
>  	.channels = ad7384_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7384_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.vcm_supplies = ad7380_4_channel_vcm_supplies,
>  	.num_vcm_supplies = ARRAY_SIZE(ad7380_4_channel_vcm_supplies),
>  	.available_scan_masks = ad7380_4_channel_scan_masks,
> @@ -448,6 +477,8 @@ static const struct ad7380_chip_info ad7386_4_chip_info =
> {
>  	.channels = ad7386_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7386_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.has_mux = true,
>  	.available_scan_masks = ad7380_2x4_channel_scan_masks,
>  	.timing_specs = &ad7380_4_timing,
> @@ -458,6 +489,8 @@ static const struct ad7380_chip_info ad7387_4_chip_info =
> {
>  	.channels = ad7387_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7387_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.has_mux = true,
>  	.available_scan_masks = ad7380_2x4_channel_scan_masks,
>  	.timing_specs = &ad7380_4_timing,
> @@ -468,6 +501,8 @@ static const struct ad7380_chip_info ad7388_4_chip_info =
> {
>  	.channels = ad7388_4_channels,
>  	.num_channels = ARRAY_SIZE(ad7388_4_channels),
>  	.num_simult_channels = 4,
> +	.supplies = ad7380_supplies,
> +	.num_supplies = ARRAY_SIZE(ad7380_supplies),
>  	.has_mux = true,
>  	.available_scan_masks = ad7380_2x4_channel_scan_masks,
>  	.timing_specs = &ad7380_4_timing,
> @@ -1004,6 +1039,14 @@ static int ad7380_probe(struct spi_device *spi)
>  	if (!st->chip_info)
>  		return dev_err_probe(&spi->dev, -EINVAL, "missing match
> data\n");
>  
> +	ret = devm_regulator_bulk_get_enable(&spi->dev, st->chip_info-
> >num_supplies,
> +					     st->chip_info->supplies);
> +
> +	if (ret)
> +		return dev_err_probe(&spi->dev, ret,
> +				     "Failed to enable power supplies\n");
> +	msleep(T_POWERUP_MS);

T_POWERUP_MS is 5ms so msleep() is not the advised API to use. In order to have
not to think about it, use fsleep(). This came up recently and this is one of
the reasons why I think (in most common cases at least) using fsleep() is a good
practise even if we already know which function we need to call. Also makes
reviewers lives easier as we don't have to double check the time being slept.

- Nuno Sá

Re: [PATCH v2 4/5] iio: adc: ad7380: fix supplies for ad7380-4

[Nuno Sá]

On Mon, 2024-10-21 at 12:00 +0200, Julien Stephan wrote:
> ad7380-4 is the only device in the family that does not have an internal
> reference. It uses "refin" as a required external reference.
> All other devices in the family use "refio"" as an optional external
> reference.
> 
> Fixes: 737413da8704 ("iio: adc: ad7380: add support for ad738x-4 4 channels
> variants")
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> ---

Hi Julien,

Patch looks good. Sorry if this already came out in the previous version or in
the other patchset you mention but shouldn't this fix come first in the series?

Anyways, for the patch itself:

Reviewed-by: Nuno Sa <nuno.sa@analog.com>

>  drivers/iio/adc/ad7380.c | 36 ++++++++++++++++++++++++++----------
>  1 file changed, 26 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
> index
> e257f78d63edd7910fcb936ec5344922f8e70b99..65096717f0dd3ea6a4ff7020bc544d62b84c
> b8fd 100644
> --- a/drivers/iio/adc/ad7380.c
> +++ b/drivers/iio/adc/ad7380.c
> @@ -89,6 +89,7 @@ struct ad7380_chip_info {
>  	bool has_mux;
>  	const char * const *supplies;
>  	unsigned int num_supplies;
> +	bool external_ref_only;
>  	const char * const *vcm_supplies;
>  	unsigned int num_vcm_supplies;
>  	const unsigned long *available_scan_masks;
> @@ -431,6 +432,7 @@ static const struct ad7380_chip_info ad7380_4_chip_info =
> {
>  	.num_simult_channels = 4,
>  	.supplies = ad7380_supplies,
>  	.num_supplies = ARRAY_SIZE(ad7380_supplies),
> +	.external_ref_only = true,
>  	.available_scan_masks = ad7380_4_channel_scan_masks,
>  	.timing_specs = &ad7380_4_timing,
>  };
> @@ -1047,17 +1049,31 @@ static int ad7380_probe(struct spi_device *spi)
>  				     "Failed to enable power supplies\n");
>  	msleep(T_POWERUP_MS);
>  
> -	/*
> -	 * If there is no REFIO supply, then it means that we are using
> -	 * the internal 2.5V reference, otherwise REFIO is reference voltage.
> -	 */
> -	ret = devm_regulator_get_enable_read_voltage(&spi->dev, "refio");
> -	if (ret < 0 && ret != -ENODEV)
> -		return dev_err_probe(&spi->dev, ret,
> -				     "Failed to get refio regulator\n");
> +	if (st->chip_info->external_ref_only) {
> +		ret = devm_regulator_get_enable_read_voltage(&spi->dev,
> +							     "refin");
> +		if (ret < 0)
> +			return dev_err_probe(&spi->dev, ret,
> +					     "Failed to get refin
> regulator\n");
> +
> +		st->vref_mv = ret / 1000;
>  
> -	external_ref_en = ret != -ENODEV;
> -	st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
> +		/* these chips don't have a register bit for this */
> +		external_ref_en = false;
> +	} else {
> +		/*
> +		 * If there is no REFIO supply, then it means that we are
> using
> +		 * the internal reference, otherwise REFIO is reference
> voltage.
> +		 */
> +		ret = devm_regulator_get_enable_read_voltage(&spi->dev,
> +							     "refio");
> +		if (ret < 0 && ret != -ENODEV)
> +			return dev_err_probe(&spi->dev, ret,
> +					     "Failed to get refio
> regulator\n");
> +
> +		external_ref_en = ret != -ENODEV;
> +		st->vref_mv = external_ref_en ? ret / 1000 :
> AD7380_INTERNAL_REF_MV;
> +	}
>  
>  	if (st->chip_info->num_vcm_supplies > ARRAY_SIZE(st->vcm_mv))
>  		return dev_err_probe(&spi->dev, -EINVAL,
> 

Re: [PATCH v2 1/5] dt-bindings: iio: adc: ad7380: fix ad7380-4 reference supply

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

On Mon, Oct 21, 2024 at 12:00:09PM +0200, Julien Stephan wrote:
> ad7380-4 is the only device from ad738x family that doesn't have an
> internal reference. Moreover its external reference is called REFIN in
> the datasheet while all other use REFIO as an optional external
> reference. If refio-supply is omitted the internal reference is
> used.
> 
> Fix the binding by adding refin-supply and makes it required for
> ad7380-4 only.
> 
> Fixes: 1a291cc8ee17 ("dt-bindings: iio: adc: ad7380: add support for ad738x-4 4 channels variants")
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 4/5] iio: adc: ad7380: fix supplies for ad7380-4

[Julien Stephan]

Le lun. 21 oct. 2024 à 13:18, Nuno Sá <noname.nuno@gmail.com> a écrit :
>
> On Mon, 2024-10-21 at 12:00 +0200, Julien Stephan wrote:
> > ad7380-4 is the only device in the family that does not have an internal
> > reference. It uses "refin" as a required external reference.
> > All other devices in the family use "refio"" as an optional external
> > reference.
> >
> > Fixes: 737413da8704 ("iio: adc: ad7380: add support for ad738x-4 4 channels
> > variants")
> > Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> > ---
>
> Hi Julien,
>
> Patch looks good. Sorry if this already came out in the previous version or in
> the other patchset you mention but shouldn't this fix come first in the series?
>

Hi Nuno,
That was my plan at first, but doing the
devm_regulator_get_enable_read_voltage() first, simplifies the next
changes ... and also eases the review :)

If needed I can do the rebase

Cheers
Julien

> Anyways, for the patch itself:
>
> Reviewed-by: Nuno Sa <nuno.sa@analog.com>
>
> >  drivers/iio/adc/ad7380.c | 36 ++++++++++++++++++++++++++----------
> >  1 file changed, 26 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c
> > index
> > e257f78d63edd7910fcb936ec5344922f8e70b99..65096717f0dd3ea6a4ff7020bc544d62b84c
> > b8fd 100644
> > --- a/drivers/iio/adc/ad7380.c
> > +++ b/drivers/iio/adc/ad7380.c
> > @@ -89,6 +89,7 @@ struct ad7380_chip_info {
> >       bool has_mux;
> >       const char * const *supplies;
> >       unsigned int num_supplies;
> > +     bool external_ref_only;
> >       const char * const *vcm_supplies;
> >       unsigned int num_vcm_supplies;
> >       const unsigned long *available_scan_masks;
> > @@ -431,6 +432,7 @@ static const struct ad7380_chip_info ad7380_4_chip_info =
> > {
> >       .num_simult_channels = 4,
> >       .supplies = ad7380_supplies,
> >       .num_supplies = ARRAY_SIZE(ad7380_supplies),
> > +     .external_ref_only = true,
> >       .available_scan_masks = ad7380_4_channel_scan_masks,
> >       .timing_specs = &ad7380_4_timing,
> >  };
> > @@ -1047,17 +1049,31 @@ static int ad7380_probe(struct spi_device *spi)
> >                                    "Failed to enable power supplies\n");
> >       msleep(T_POWERUP_MS);
> >
> > -     /*
> > -      * If there is no REFIO supply, then it means that we are using
> > -      * the internal 2.5V reference, otherwise REFIO is reference voltage.
> > -      */
> > -     ret = devm_regulator_get_enable_read_voltage(&spi->dev, "refio");
> > -     if (ret < 0 && ret != -ENODEV)
> > -             return dev_err_probe(&spi->dev, ret,
> > -                                  "Failed to get refio regulator\n");
> > +     if (st->chip_info->external_ref_only) {
> > +             ret = devm_regulator_get_enable_read_voltage(&spi->dev,
> > +                                                          "refin");
> > +             if (ret < 0)
> > +                     return dev_err_probe(&spi->dev, ret,
> > +                                          "Failed to get refin
> > regulator\n");
> > +
> > +             st->vref_mv = ret / 1000;
> >
> > -     external_ref_en = ret != -ENODEV;
> > -     st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
> > +             /* these chips don't have a register bit for this */
> > +             external_ref_en = false;
> > +     } else {
> > +             /*
> > +              * If there is no REFIO supply, then it means that we are
> > using
> > +              * the internal reference, otherwise REFIO is reference
> > voltage.
> > +              */
> > +             ret = devm_regulator_get_enable_read_voltage(&spi->dev,
> > +                                                          "refio");
> > +             if (ret < 0 && ret != -ENODEV)
> > +                     return dev_err_probe(&spi->dev, ret,
> > +                                          "Failed to get refio
> > regulator\n");
> > +
> > +             external_ref_en = ret != -ENODEV;
> > +             st->vref_mv = external_ref_en ? ret / 1000 :
> > AD7380_INTERNAL_REF_MV;
> > +     }
> >
> >       if (st->chip_info->num_vcm_supplies > ARRAY_SIZE(st->vcm_mv))
> >               return dev_err_probe(&spi->dev, -EINVAL,
> >
>

Re: [PATCH v2 0/5] iio: adc: ad7380: fix several supplies issues

[David Lechner]

On 10/21/24 5:00 AM, Julien Stephan wrote:
> Hello,
> 
> This series tries to fix several issues found on the ad7380 driver about
> supplies:
> 
> - vcc and vlogic are required, but are not retrieved and enabled in the
> probe function
> - ad7380-4 is the only device from the family that does not have internal
> reference and uses REFIN instead of REFIO for external reference.
> 
> driver, bindings, and doc are fixed accordingly
> 
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> ---
For the series: 

Reviewed-by: David Lechner <dlechner@baylibre.com>