github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 14:12:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: dac: ad7293: enable power before reset

Browse Source 
Change the order of regulator enable and reset so that power supplies
are turned on before touching the reset line. Generally, chips should
have the VDRIVE supply enabled before applying voltage on any pins.

While we are at it, remove the voltage level checks. If the power
supplies are not supplying the correct voltage, this is a hardware
design problem, not a software problem.

Signed-off-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20241216-iio-regulator-cleanup-round-6-v2-1-9482164b68cb@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
David Lechner 2024-12-16 15:44:03 -06:00 committed by Jonathan Cameron
parent 6ade82946f
commit 84b6b55584
1 changed files with 9 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/iio/dac/ad7293.c
View File

@ -141,8 +141,6 @@ struct ad7293_state {
/* Protect against concurrent accesses to the device, page selection and data content */
struct mutex lock;
struct gpio_desc *gpio_reset;
struct regulator *reg_avdd;
struct regulator *reg_vdrive;
u8 page_select;
u8 data[3] __aligned(IIO_DMA_MINALIGN);
};
@ -777,6 +775,15 @@ static int ad7293_reset(struct ad7293_state *st)
static int ad7293_properties_parse(struct ad7293_state *st)
{
struct spi_device *spi = st->spi;
int ret;
ret = devm_regulator_get_enable(&spi->dev, "avdd");
if (ret)
return dev_err_probe(&spi->dev, ret, "failed to enable AVDD\n");
ret = devm_regulator_get_enable(&spi->dev, "vdrive");
if (ret)
return dev_err_probe(&spi->dev, ret, "failed to enable VDRIVE\n");
st->gpio_reset = devm_gpiod_get_optional(&st->spi->dev, "reset",
GPIOD_OUT_HIGH);
@ -784,24 +791,9 @@ static int ad7293_properties_parse(struct ad7293_state *st)
return dev_err_probe(&spi->dev, PTR_ERR(st->gpio_reset),
"failed to get the reset GPIO\n");
st->reg_avdd = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(st->reg_avdd))
return dev_err_probe(&spi->dev, PTR_ERR(st->reg_avdd),
"failed to get the AVDD voltage\n");
st->reg_vdrive = devm_regulator_get(&spi->dev, "vdrive");
if (IS_ERR(st->reg_vdrive))
return dev_err_probe(&spi->dev, PTR_ERR(st->reg_vdrive),
"failed to get the VDRIVE voltage\n");
return 0;
}
static void ad7293_reg_disable(void *data)
{
regulator_disable(data);
}
static int ad7293_init(struct ad7293_state *st)
{
int ret;
@ -816,48 +808,6 @@ static int ad7293_init(struct ad7293_state *st)
if (ret)
return ret;
ret = regulator_enable(st->reg_avdd);
if (ret) {
dev_err(&spi->dev,
"Failed to enable specified AVDD Voltage!\n");
return ret;
}
ret = devm_add_action_or_reset(&spi->dev, ad7293_reg_disable,
st->reg_avdd);
if (ret)
return ret;
ret = regulator_enable(st->reg_vdrive);
if (ret) {
dev_err(&spi->dev,
"Failed to enable specified VDRIVE Voltage!\n");
return ret;
}
ret = devm_add_action_or_reset(&spi->dev, ad7293_reg_disable,
st->reg_vdrive);
if (ret)
return ret;
ret = regulator_get_voltage(st->reg_avdd);
if (ret < 0) {
dev_err(&spi->dev, "Failed to read avdd regulator: %d\n", ret);
return ret;
}
if (ret > 5500000 || ret < 4500000)
return -EINVAL;
ret = regulator_get_voltage(st->reg_vdrive);
if (ret < 0) {
dev_err(&spi->dev,
"Failed to read vdrive regulator: %d\n", ret);
return ret;
}
if (ret > 5500000 || ret < 1700000)
return -EINVAL;
/* Check Chip ID */
ret = __ad7293_spi_read(st, AD7293_REG_DEVICE_ID, &chip_id);
if (ret)