smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adc: Use regulator_set_enable_if_allowed

Browse Source 
With the commit 4fcba5d556 ("regulator: implement basic reference
counter") the return value of regulator_set_enable may be EALREADY or
EBUSY for fixed/gpio regulators.

Change to use the more relaxed regulator_set_enable_if_allowed to
continue if regulator already was enabled or disabled.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>  # rockpro64-rk3399
This commit is contained in:
Jonas Karlman
2023-07-19 21:20:55 +00:00
committed by Tom Rini
parent 321d7b4d87
commit d82cbc596e
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/adc/adc-uclass.c
View File

@@ -51,23 +51,21 @@ static int check_channel(struct udevice *dev, int value, bool number_or_mask,
static int adc_supply_enable(struct udevice *dev) static int adc_supply_enable(struct udevice *dev)
{ {
struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
const char *supply_type; int ret;
int ret = 0;
if (uc_pdata->vdd_supply) { ret = regulator_set_enable_if_allowed(uc_pdata->vdd_supply, true);
supply_type = "vdd"; if (ret && ret != -ENOSYS) {
ret = regulator_set_enable(uc_pdata->vdd_supply, true); pr_err("%s: can't enable vdd-supply!", dev->name);
return ret;
} }
if (!ret && uc_pdata->vss_supply) { ret = regulator_set_enable_if_allowed(uc_pdata->vss_supply, true);
supply_type = "vss"; if (ret && ret != -ENOSYS) {
ret = regulator_set_enable(uc_pdata->vss_supply, true); pr_err("%s: can't enable vss-supply!", dev->name);
return ret;
} }
if (ret) return 0;
pr_err("%s: can't enable %s-supply!", dev->name, supply_type);
return ret;
} }
int adc_data_mask(struct udevice *dev, unsigned int *data_mask) int adc_data_mask(struct udevice *dev, unsigned int *data_mask)