diff options
Diffstat (limited to 'drivers/power/regulator/gpio-regulator.c')
| -rw-r--r-- | drivers/power/regulator/gpio-regulator.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 28c9e222e2..e5e08a33d3 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -18,23 +18,23 @@ #define GPIO_REGULATOR_MAX_STATES 2 -struct gpio_regulator_platdata { - struct regulator_common_platdata common; +struct gpio_regulator_plat { + struct regulator_common_plat common; struct gpio_desc gpio; /* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES]; int voltages[GPIO_REGULATOR_MAX_STATES]; }; -static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) +static int gpio_regulator_of_to_plat(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; - struct gpio_regulator_platdata *dev_pdata; + struct dm_regulator_uclass_plat *uc_pdata; + struct gpio_regulator_plat *dev_pdata; struct gpio_desc *gpio; int ret, count, i, j; u32 states_array[GPIO_REGULATOR_MAX_STATES * 2]; - dev_pdata = dev_get_platdata(dev); - uc_pdata = dev_get_uclass_platdata(dev); + dev_pdata = dev_get_plat(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO; @@ -74,19 +74,19 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) j++; } - return regulator_common_ofdata_to_platdata(dev, &dev_pdata->common, "enable-gpios"); + return regulator_common_of_to_plat(dev, &dev_pdata->common, "enable-gpios"); } static int gpio_regulator_get_value(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct dm_regulator_uclass_plat *uc_pdata; + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); int enable; if (!dev_pdata->gpio.dev) return -ENOSYS; - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (uc_pdata->min_uV > uc_pdata->max_uV) { debug("Invalid constraints for: %s\n", uc_pdata->name); return -EINVAL; @@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct udevice *dev) static int gpio_regulator_set_value(struct udevice *dev, int uV) { - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); int ret; bool enable; @@ -127,13 +127,13 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV) static int gpio_regulator_get_enable(struct udevice *dev) { - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); return regulator_common_get_enable(dev, &dev_pdata->common); } static int gpio_regulator_set_enable(struct udevice *dev, bool enable) { - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); return regulator_common_set_enable(dev, &dev_pdata->common, enable); } @@ -154,6 +154,6 @@ U_BOOT_DRIVER(gpio_regulator) = { .id = UCLASS_REGULATOR, .ops = &gpio_regulator_ops, .of_match = gpio_regulator_ids, - .ofdata_to_platdata = gpio_regulator_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct gpio_regulator_platdata), + .of_to_plat = gpio_regulator_of_to_plat, + .plat_auto = sizeof(struct gpio_regulator_plat), }; |