[PATCH v4 5/6] iio: dac: ad5504: strictly separate ACPI and DT probe paths
Taha Ed-Dafili <[email protected]>
| Newsgroups | org.kernel.vger.linux-devicetree,org.kernel.vger.linux-iio,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Refactor the ad5504_probe() function to explicitly separate the ACPI and Device Tree execution paths. Previously, the driver relied on a fragile -ENODEV return value check from the regulator framework to bypass the voltage check on ACPI platforms. Following modern IIO subsystem design patterns (such as those found in adc/ti-ads7950.c), fork the logic using ACPI_COMPANION(). On ACPI systems, where dedicated voltage regulators are typically omitted from the firmware description, bypass the regulator subsystem entirely and initialize the reference voltage to the hardware default 60V scale via a new macro AD5504_VA_MV_ACPI_DEFAULT. For Device Tree platforms, treat the VCC regulator as mandatory and wrap the allocation in dev_err_probe() to cleanly handle potential deferrals and error propagation. Signed-off-by: Taha Ed-Dafili <[email protected]> --- drivers/iio/dac/ad5504.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 87946cdf69e7..546420f9afc0 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c @@ -19,6 +19,7 @@ #include <linux/spi/spi.h> #include <linux/sysfs.h> #include <linux/types.h> +#include <linux/units.h> #include <linux/iio/events.h> #include <linux/iio/iio.h> @@ -26,6 +27,10 @@ #include <asm/byteorder.h> +/* + * In case of ACPI, we use the 60 V as default voltage reference. + */ +#define AD5504_VA_MV_ACPI_DEFAULT (60 * MILLI) #define AD5504_RES_MASK GENMASK(11, 0) #define AD5504_CMD_READ BIT(15) #define AD5504_CMD_WRITE 0 @@ -300,11 +305,16 @@ static int ad5504_probe(struct spi_device *spi) if (ret) return ret; - ret = devm_regulator_get_enable_read_voltage(dev, "vcc"); - if (ret < 0) - return ret; + if (ACPI_COMPANION(dev)) { + st->vref_mv = AD5504_VA_MV_ACPI_DEFAULT; + } else { + ret = devm_regulator_get_enable_read_voltage(dev, "vcc"); + if (ret < 0) + return dev_err_probe(dev, ret, + "Failed to get vcc regulator\n"); - st->vref_mv = ret / 1000; + st->vref_mv = ret / MILLI; + } st->spi = spi; indio_dev->name = spi_get_device_id(st->spi)->name; -- 2.55.0