diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-11 13:55:03 -0500 |
| commit | d71be1990218957b9f05dbf13a72859a2abe06d7 (patch) | |
| tree | 99858dc9988f7f7b4c0ab1d8d45738e3abdf38c8 /drivers/power/regulator/regulator_common.c | |
| parent | c4fddedc48f336eabc4ce3f74940e6aa372de18c (diff) | |
| parent | bc0b99bd8b19599f670f42401de655fa9b44cd94 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/power/regulator/regulator_common.c')
| -rw-r--r-- | drivers/power/regulator/regulator_common.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 13906b9c6e..93d8196b38 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -12,8 +12,9 @@ #include "regulator_common.h" -int regulator_common_ofdata_to_platdata(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name) +int regulator_common_of_to_plat(struct udevice *dev, + struct regulator_common_plat *dev_pdata, + const char *enable_gpio_name) { struct gpio_desc *gpio; int flags = GPIOD_IS_OUT; @@ -48,7 +49,7 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev, } int regulator_common_get_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata) + struct regulator_common_plat *dev_pdata) { /* Enable GPIO is optional */ if (!dev_pdata->gpio.dev) @@ -58,7 +59,7 @@ int regulator_common_get_enable(const struct udevice *dev, } int regulator_common_set_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata, bool enable) + struct regulator_common_plat *dev_pdata, bool enable) { int ret; |