regulator: Factor out common enable code
PATCH v2 1/2 regulator: Factor out common enable code
From: Sven Schwermer <[email protected]>
In preparation of being able to enable/disable GPIO regulators, the code that will be shared among the two kinds to regulators is factored out into its own source files.
--- drivers/power/regulator/Kconfig | 10 +++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/fixed.c | 75 ++------------------ drivers/power/regulator/regulator_common.c | 80 ++++++++++++++++++++++ drivers/power/regulator/regulator_common.h | 27 ++++++++ 5 files changed, 124 insertions(+), 69 deletions(-) create mode 100644 drivers/power/regulator/regulator_common.c create mode 100644 drivers/power/regulator/regulator_common.h
drivers/power/regulator/Kconfig +10 -0
@@ -92,9 +92,18 @@ config DM_REGULATOR_FAN53555 or switching the mode is not supported by this driver (at this time). +config DM_REGULATOR_COMMON + bool + depends on DM_REGULATOR + +config SPL_DM_REGULATOR_COMMON + bool + depends on DM_REGULATOR + config DM_REGULATOR_FIXED bool "Enable Driver Model for REGULATOR Fixed value" depends on DM_REGULATOR + select DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulator uclass features for fixed value regulators. The driver implements get/set api
@@ -103,6 +112,7 @@ config DM_REGULATOR_FIXED config SPL_DM_REGULATOR_FIXED bool "Enable Driver Model for REGULATOR Fixed value in SPL" depends on DM_REGULATOR_FIXED + select SPL_DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulator uclass features for fixed value regulators in SPL.
drivers/power/regulator/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o obj-$(CONFIG_$(SPL_)DM_PMIC_PFUZE100) += pfuze100.o obj-$(CONFIG_$(SPL_)REGULATOR_PWM) += pwm_regulator.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_FAN53555) += fan53555.o +obj-$(CONFIG_$(SPL_)DM_REGULATOR_COMMON) += regulator_common.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o obj-$(CONFIG_REGULATOR_RK8XX) += rk8xx.o
drivers/power/regulator/fixed.c +6 -69
112 lines not on this page · raw message
drivers/power/regulator/regulator_common.c new file +80 -0
80 lines not on this page · raw message
drivers/power/regulator/regulator_common.h new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2019 Disruptive Technologies Research AS +* Sven Schwermer <[email protected]> +*/ + +#ifndef _REGULATOR_COMMON_H +#define _REGULATOR_COMMON_H + +#include <common.h> +#include <asm/gpio.h> +#include <dm.h> + +struct regulator_common_platdata { +struct gpio_desc gpio;/* GPIO for regulator enable control */ +unsigned int startup_delay_us; +unsigned int off_on_delay_us; +}; + +int regulator_common_ofdata_to_platdata (struct udevice *dev, +struct regulator_common_platdata *dev_pdata,const char *enable_gpio_name); +int regulator_common_get_enable (const struct udevice *dev, +struct regulator_common_platdata *dev_pdata); +int regulator_common_set_enable (const struct udevice *dev, +struct regulator_common_platdata *dev_pdata,bool enable); + +#endif /* _REGULATOR_COMMON_H */
Signature · 1 line
2.17.1
PATCH v2 2/2 regulator: Allow enabling GPIO regulator
From: Sven Schwermer <[email protected]>
Drivers need to be able to enable regulators that may be implemented as GPIO regulators. Example: fsl_esdhc enables the vqmmc supply which is commonly implemented as a GPIO regulator in order to switch between I/O voltage levels.
--- drivers/power/regulator/Kconfig | 2 ++ drivers/power/regulator/gpio-regulator.c | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/power/regulator/Kconfig +2 -0
@@ -120,6 +120,7 @@ config SPL_DM_REGULATOR_FIXED config DM_REGULATOR_GPIO bool "Enable Driver Model for GPIO REGULATOR" depends on DM_REGULATOR && DM_GPIO + select DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulator uclass features for gpio regulators. The driver implements get/set for
@@ -128,6 +129,7 @@ config DM_REGULATOR_GPIO config SPL_DM_REGULATOR_GPIO bool "Enable Driver Model for GPIO REGULATOR in SPL" depends on DM_REGULATOR_GPIO && SPL_GPIO_SUPPORT + select SPL_DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulator uclass features for gpio regulators in SPL.
drivers/power/regulator/gpio-regulator.c +17 -1
@@ -4,6 +4,7 @@* Keerthy <[email protected]> */ +#include "regulator_common.h" #include <common.h> #include <fdtdec.h> #include <errno.h>
@@ -18,6 +19,7 @@DECLARE_GLOBAL_DATA_PTR ;struct gpio_regulator_platdata { +struct regulator_common_platdata common;struct gpio_desc gpio;/* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES ];int voltages[GPIO_REGULATOR_MAX_STATES ];
@@ -65,7 +67,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) j++; } -return 0 ; +return regulator_common_ofdata_to_platdata (dev, &dev_pdata->common,"enable-gpios" ); }static int gpio_regulator_get_value (struct udevice *dev)
@@ -116,9 +118,23 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV)return 0 ; } +static int gpio_regulator_get_enable (struct udevice *dev) +{ +struct gpio_regulator_platdata *dev_pdata =dev_get_platdata (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); +return regulator_common_set_enable (dev, &dev_pdata->common, enable); +} +static const struct dm_regulator_ops gpio_regulator_ops = { .get_value = gpio_regulator_get_value, .set_value = gpio_regulator_set_value, + .get_enable = gpio_regulator_get_enable, + .set_enable = gpio_regulator_set_enable, };static const struct udevice_id gpio_regulator_ids[] = {
Signature · 1 line
2.17.1
PATCH v2 2/2 regulator: Allow enabling GPIO regulator
Quoted 78 lines · On Mon, 24 Jun 2019 13:03:34 +0200 sven at svenschwermer.de wrote:
From: Sven Schwermer <[email protected]>
Drivers need to be able to enable regulators that may be implemented as GPIO regulators. Example:
fsl_esdhcenables the vqmmc supply which is commonly implemented as a GPIO regulator in order to switch between I/O voltage levels.Signed-off-by Sven Schwermer <[email protected]>--- drivers/power/regulator/Kconfig | 2 ++ drivers/power/regulator/gpio-regulator.c | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)(quoted diff) +0
-0b/drivers/power/regulator/Kconfig index
e0b8398ef4..bb10d20545100644drivers/power/regulator/Kconfig +1
-0@@ -120,6 +120,7 @@ config SPL_DM_REGULATOR_FIXED config DM_REGULATOR_GPIO bool "Enable Driver Model for GPIO REGULATOR" depends on DM_REGULATOR && DM_GPIO + select DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulatoruclass features for gpio regulators. The driver implements get/set for
drivers/power/regulator/Kconfig +1
-0@@ -128,6 +129,7 @@ config DM_REGULATOR_GPIO config SPL_DM_REGULATOR_GPIO bool "Enable Driver Model for GPIO REGULATOR in SPL" depends on DM_REGULATOR_GPIO && SPL_GPIO_SUPPORT + select SPL_DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulatoruclass features for gpio regulators in SPL.
(quoted diff) +0
-0
b/drivers/power/regulator/gpio-regulator.cindexd18e5d8d2c..ec1dcb64b3100644 ---a/drivers/power/regulator/gpio-regulator.c+++b/drivers/power/regulator/gpio-regulator.c@@ -4,6 +4,7 @@
* Keerthy <[email protected]>
*/drivers/power/regulator/Kconfig +12
-1+#include "regulator_common.h" #include <common.h> #include <fdtdec.h> #include <errno.h>@@ -18,6 +19,7 @@ DECLARE_GLOBAL_DATA_PTR; struct gpio_regulator_platdata { + struct regulator_common_platdata common; struct gpio_desc gpio; /* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES]; int voltages[GPIO_REGULATOR_MAX_STATES];@@ -65,7 +67,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) j++; } - return 0; + return regulator_common_ofdata_to_platdata(dev, &dev_pdata->common, "enable-gpios"); } static int gpio_regulator_get_value(struct udevice *dev)@@ -116,9 +118,23 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV) return 0; } +static int gpio_regulator_get_enable(struct udevice *dev) +{ + struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(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); + return regulator_common_set_enable(dev, &dev_pdata->common,
drivers/power/regulator/Kconfig static int gpio_regulator_set_value(struct
Quoted 10 lines
drivers/power/regulator/Kconfig +3
-0enable); +} + static const struct dm_regulator_ops gpio_regulator_ops = { .get_value = gpio_regulator_get_value, .set_value = gpio_regulator_set_value, + .get_enable = gpio_regulator_get_enable, + .set_enable = gpio_regulator_set_enable, }; static const struct udevice_id gpio_regulator_ids[] = {
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190628/2a00fc51/attachment.sig>
PATCH v2 2/2 regulator: Allow enabling GPIO regulator
Hi again,
Is there anything else I should do in order to get this applied?
Best regards
Sven
Quoted 106 lines · Lukasz Majewski
Quoted 87 lines · On Mon, 24 Jun 2019 13:03:34 +0200 sven at svenschwermer.de wrote:
From: Sven Schwermer <[email protected]>
Drivers need to be able to enable regulators that may be implemented as GPIO regulators. Example:
fsl_esdhcenables the vqmmc supply which is commonly implemented as a GPIO regulator in order to switch between I/O voltage levels.Signed-off-by Sven Schwermer <[email protected]>---
drivers/power/regulator/Kconfig| 2 ++drivers/power/regulator/gpio-regulator.c| 18 +++++++++++++++++-2 files changed, 19 insertions(+), 1 deletion(-)(quoted diff) +0
-0b/drivers/power/regulator/Kconfig index
e0b8398ef4..bb10d20545100644drivers/power/regulator/Kconfig +0
-0@@ -120,6 +120,7 @@ config SPL_DM_REGULATOR_FIXEDconfig
DM_REGULATOR_GPIObool "Enable Driver Model for GPIO REGULATOR" depends on DM_REGULATOR && DM_GPIOdrivers/power/regulator/Kconfig +1
-0+ select DM_REGULATOR_COMMON---help--- This config enables implementation of driver-model regulatoruclass features for gpio regulators. The driver implements get/set for
drivers/power/regulator/Kconfig +0
-0@@ -128,6 +129,7 @@ config DM_REGULATOR_GPIOconfig
SPL_DM_REGULATOR_GPIObool "Enable Driver Model for GPIO REGULATOR in SPL" depends on DM_REGULATOR_GPIO && SPL_GPIO_SUPPORTdrivers/power/regulator/Kconfig +1
-0+ select SPL_DM_REGULATOR_COMMON---help--- This config enables implementation of driver-model regulatoruclass features for gpio regulators in SPL.
(quoted diff) +0
-0
b/drivers/power/regulator/gpio-regulator.cindexd18e5d8d2c..ec1dcb64b3100644 ---a/drivers/power/regulator/gpio-regulator.c+++b/drivers/power/regulator/gpio-regulator.c@@ -4,6 +4,7 @@
* Keerthy <[email protected]>
*/+#include "
regulator_common.h"
#include <common.h>
#include <fdtdec.h>
#include <errno.h>drivers/power/regulator/Kconfig +12
-1@@ -18,6 +19,7 @@ DECLARE_GLOBAL_DATA_PTR; struct gpio_regulator_platdata { + struct regulator_common_platdata common; struct gpio_desc gpio; /* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES]; int voltages[GPIO_REGULATOR_MAX_STATES];@@ -65,7 +67,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) j++; } - return 0; + return regulator_common_ofdata_to_platdata(dev, &dev_pdata->common, "enable-gpios"); } static int gpio_regulator_get_value(struct udevice *dev)@@ -116,9 +118,23 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV) return 0; } +static int gpio_regulator_get_enable(struct udevice *dev) +{ + struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(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); + return regulator_common_set_enable(dev, &dev_pdata->common, enable); +} + static const struct dm_regulator_ops gpio_regulator_ops = { .get_value = gpio_regulator_get_value,.set_value =
gpio_regulator_set_value,drivers/power/regulator/Kconfig +2
-0+ .get_enable = gpio_regulator_get_enable, + .set_enable = gpio_regulator_set_enable,};
Quoted 1 line
static const struct
udevice_idgpio_regulator_ids[] = {Reviewed-by Lukasz Majewski <[email protected]>Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
PATCH v2 2/2 regulator: Allow enabling GPIO regulator
Quoted 5 lines
Subject: Re: [U-Boot] [PATCH v2 2/2] regulator: Allow enabling GPIO regulator
Hi again,
Is there anything else I should do in order to get this applied?
+ Tom
Quoted 109 lines
Best regards
SvenQuoted 94 lines · Lukasz Majewski
Quoted 84 lines · On Mon, 24 Jun 2019 13:03:34 +0200 sven at svenschwermer.de wrote:
From: Sven Schwermer <[email protected]>
Drivers need to be able to enable regulators that may be implemented as GPIO regulators. Example:
fsl_esdhcenables the vqmmc supply which is commonly implemented as a GPIO regulator in order to switch between I/O voltage levels.Signed-off-by Sven Schwermer <[email protected]>---
drivers/power/regulator/Kconfig| 2 ++drivers/power/regulator/gpio-regulator.c| 18 +++++++++++++++++-2 files changed, 19 insertions(+), 1 deletion(-)(quoted diff) +0
-0b/drivers/power/regulator/Kconfig index
e0b8398ef4..bb10d20545100644drivers/power/regulator/Kconfig +0
-0@@ -120,6 +120,7 @@ config SPL_DM_REGULATOR_FIXED config
DM_REGULATOR_GPIObool "Enable Driver Model for GPIO REGULATOR" depends on DM_REGULATOR && DM_GPIOdrivers/power/regulator/Kconfig +1
-0+ select DM_REGULATOR_COMMON---help--- This config enables implementation of driver-model regulator uclass features for gpio regulators. The driver implements get/set for @@ -128,6 +129,7 @@ config DM_REGULATOR_GPIO config SPL_DM_REGULATOR_GPIO bool "Enable Driver Model for GPIO REGULATOR in SPL" depends on DM_REGULATOR_GPIO && SPL_GPIO_SUPPORTdrivers/power/regulator/Kconfig +1
-0+ select SPL_DM_REGULATOR_COMMON---help--- This config enables implementation of driver-model regulator uclassfeatures for gpio regulators in SPL.
(quoted diff) +0
-0
b/drivers/power/regulator/gpio-regulator.cindexd18e5d8d2c..ec1dcb64b3100644 ---a/drivers/power/regulator/gpio-regulator.c+++b/drivers/power/regulator/gpio-regulator.c@@ -4,6 +4,7 @@
* Keerthy <[email protected]>
*/+#include "
regulator_common.h"
#include <common.h>
#include <fdtdec.h>
#include <errno.h>drivers/power/regulator/Kconfig +2
-1@@ -18,6 +19,7 @@ DECLARE_GLOBAL_DATA_PTR; struct gpio_regulator_platdata { + struct regulator_common_platdata common; struct gpio_desc gpio; /* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES]; int voltages[GPIO_REGULATOR_MAX_STATES];@@ -65,7 +67,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) j++; } - return 0; + return regulator_common_ofdata_to_platdata(dev, &dev_pdata->common, "enable-gpios"); }static int
gpio_regulator_get_value(struct udevice *dev)@@ -116,9 +118,23 @@ static intgpio_regulator_set_value(struct udevice *dev, int uV)return 0; }drivers/power/regulator/Kconfig +2
-0+static int gpio_regulator_get_enable(struct udevice *dev) { + struct gpio_regulator_platdata *dev_pdata =
dev_get_platdata(dev);drivers/power/regulator/Kconfig +3
-0+ return regulator_common_get_enable(dev, &dev_pdata->common); } + +static int gpio_regulator_set_enable(struct udevice *dev, boolenable) +{
drivers/power/regulator/Kconfig +1
-0+ struct gpio_regulator_platdata *dev_pdata =
dev_get_platdata(dev);drivers/power/regulator/Kconfig +1
-0+ return regulator_common_set_enable(dev, &dev_pdata->common,enable); +}
+
static const structdm_regulator_opsgpio_regulator_ops= {
.get_value =gpio_regulator_get_value,
.set_value =gpio_regulator_set_value,drivers/power/regulator/Kconfig +2
-0+ .get_enable = gpio_regulator_get_enable, + .set_enable = gpio_regulator_set_enable,};
Quoted 1 line
static const struct
udevice_idgpio_regulator_ids[] = {Reviewed-by Lukasz Majewski <[email protected]>Quoted 7 lines
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang
Denk
Quoted 3 lines
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email:
lukma at denx.de
PATCH v2 2/2 regulator: Allow enabling GPIO regulator
In reply to sven at svenschwermer.deQuoted 9 lines · sven at svenschwermer.de
From: Sven Schwermer <[email protected]>
Drivers need to be able to enable regulators that may be implemented as GPIO regulators. Example:
fsl_esdhcenables the vqmmc supply which is commonly implemented as a GPIO regulator in order to switch between I/O voltage levels.Signed-off-by Sven Schwermer <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190718/c8898557/attachment.sig>
PATCH v2 1/2 regulator: Factor out common enable code
In reply to sven at svenschwermer.deQuoted 307 lines · On Mon, 24 Jun 2019 13:03:33 +0200 sven at svenschwermer.de wrote:
From: Sven Schwermer <[email protected]>
In preparation of being able to enable/disable GPIO regulators, the code that will be shared among the two kinds to regulators is factored out into its own source files.
Signed-off-by Sven Schwermer <[email protected]>--- drivers/power/regulator/Kconfig | 10 +++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/fixed.c | 75 ++------------------ drivers/power/regulator/regulator_common.c | 80 ++++++++++++++++++++++ drivers/power/regulator/regulator_common.h | 27 ++++++++ 5 files changed, 124 insertions(+), 69 deletions(-) create mode 100644 drivers/power/regulator/regulator_common.c create mode 100644 drivers/power/regulator/regulator_common.h(quoted diff) +0
-0b/drivers/power/regulator/Kconfig index
72dfc48981..e0b8398ef4100644drivers/power/regulator/Kconfig +9
-0@@ -92,9 +92,18 @@ config DM_REGULATOR_FAN53555 or switching the mode is not supported by this driver (at this time). +config DM_REGULATOR_COMMON + bool + depends on DM_REGULATOR + +config SPL_DM_REGULATOR_COMMON + bool + depends on DM_REGULATOR + config DM_REGULATOR_FIXED bool "Enable Driver Model for REGULATOR Fixed value" depends on DM_REGULATOR + select DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulatoruclass features for fixed value regulators. The driver implements get/set api @@ -103,6 +112,7 @@ config
DM_REGULATOR_FIXED
configSPL_DM_REGULATOR_FIXEDdrivers/power/regulator/Kconfig +1
-0bool "Enable Driver Model for REGULATOR Fixed value in SPL" depends on DM_REGULATOR_FIXED + select SPL_DM_REGULATOR_COMMON ---help--- This config enables implementation of driver-model regulatoruclass features for fixed value regulators in SPL.
(quoted diff) +0
-0b/drivers/power/regulator/Makefile index
8c1506c88e..e728b73aee100644drivers/power/regulator/Makefile +1
-0@@ -11,6 +11,7 @@ obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o obj-$(CONFIG_$(SPL_)DM_PMIC_PFUZE100) += pfuze100.o obj-$(CONFIG_$(SPL_)REGULATOR_PWM) += pwm_regulator.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_FAN53555) += fan53555.o +obj-$(CONFIG_$(SPL_)DM_REGULATOR_COMMON) += regulator_common.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o obj-$(CONFIG_REGULATOR_RK8XX) += rk8xx.o(quoted diff) +0
-0
b/drivers/power/regulator/fixed.cindexa99aa78310..763e671d54100644drivers/power/regulator/fixed.c +2
-31@@ -5,56 +5,26 @@* Przemyslaw Marczak <[email protected]> */ +#include "regulator_common.h" #include <common.h> #include <errno.h> #include <dm.h> -#include <i2c.h> -#include <asm/gpio.h> #include <power/pmic.h> #include <power/regulator.h> -struct fixed_regulator_platdata { -struct gpio_desc gpio;/* GPIO for regulator enable control */ -unsigned int startup_delay_us; -unsigned int off_on_delay_us; -}; -static int fixed_regulator_ofdata_to_platdata (struct udevice *dev) {struct dm_regulator_uclass_platdata *uc_pdata; -struct fixed_regulator_platdata *dev_pdata; -struct gpio_desc *gpio; -int flags =GPIOD_IS_OUT ; -int ret; +struct regulator_common_platdata *dev_pdata; dev_pdata =dev_get_platdata (dev); uc_pdata =dev_get_uclass_platdata (dev);if (!uc_pdata)return -ENXIO ; -/* Set type to fixed */ uc_pdata->type =REGULATOR_TYPE_FIXED ; -if (dev_read_bool (dev,"enable-active-high" )) - flags |=GPIOD_IS_OUT_ACTIVE ; - -/* Get fixed regulator optional enable GPIO desc */ - gpio = &dev_pdata->gpio; - ret =gpio_request_by_name (dev,"gpio" ,0 , gpio, flags); -if (ret) { -debug ("Fixed regulator optional enable GPIO - not found! Error: %d\n", - ret); -if (ret != -ENOENT ) -return ret; - } - -/* Get optional ramp up delay */ - dev_pdata->startup_delay_us =dev_read_u32_default (dev, -"startup-delay-us" , 0); - dev_pdata->off_on_delay_us = - dev_read_u32_default(dev,"u-boot,off-on-delay-us", 0); -
drivers/power/regulator/fixed.c +1
-1-return 0 ; + return regulator_common_ofdata_to_platdata(dev, dev_pdata,"gpio"); }
static int
fixed_regulator_get_value(struct udevice *dev)drivers/power/regulator/fixed.c +0
-1@@ -91,45 +61,12 @@ static int fixed_regulator_get_current(struct udevice *dev)static int fixed_regulator_get_enable (struct udevice *dev) { - struct fixed_regulator_platdata *dev_pdata =
dev_get_platdata(dev); -drivers/power/regulator/fixed.c +1
-5-/* Enable GPIO is optional */ -if (!dev_pdata->gpio.dev) -return true; - -return dm_gpio_get_value (&dev_pdata->gpio); + return regulator_common_get_enable(dev,
dev_get_platdata(dev)); }static int fixed_regulator_set_enable(struct udevice *dev, bool
enable) {drivers/power/regulator/fixed.c +0
-1- struct fixed_regulator_platdata *dev_pdata =
dev_get_platdata(dev);drivers/power/regulator/fixed.c +0
-3-int ret; - - debug("%s: dev='%s', enable=%d, delay=%d, has_gpio=%d\n",
__func__,drivers/power/regulator/fixed.c +0
-12- dev->name, enable, dev_pdata->startup_delay_us, - dm_gpio_is_valid(&dev_pdata->gpio)); -/* Enable GPIO is optional */ -if (!dm_gpio_is_valid (&dev_pdata->gpio)) { -if (!enable) -return -ENOSYS ; -return 0 ; - } - - ret =dm_gpio_set_value (&dev_pdata->gpio, enable); -if (ret) { - pr_err("Can't set regulator : %s gpio to: %d\n",
dev->name,drivers/power/regulator/fixed.c +1
-12- enable); -return ret; - } - -if (enable && dev_pdata->startup_delay_us) -udelay (dev_pdata->startup_delay_us); -debug ("%s: done\n" , __func__); - -if (!enable && dev_pdata->off_on_delay_us) -udelay (dev_pdata->off_on_delay_us); - -return 0 ; + return regulator_common_set_enable(dev,
dev_get_platdata(dev), enable); }static const struct
dm_regulator_opsfixed_regulator_ops= {drivers/power/regulator/fixed.c +1
-1@@ -150,5 +87,5 @@ U_BOOT_DRIVER(fixed_regulator) = { .ops = &fixed_regulator_ops, .of_match = fixed_regulator_ids, .ofdata_to_platdata = fixed_regulator_ofdata_to_platdata, - .platdata_auto_alloc_size =sizeof (struct fixed_regulator_platdata), + .platdata_auto_alloc_size = sizeof(struct
regulator_common_platdata), };(quoted diff) +0
-0
b/drivers/power/regulator/regulator_common.cnew file mode 100644 index 0000000000..3dabbe2a85drivers/power/regulator/regulator_common.c new file +12
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2019 Disruptive Technologies Research AS +* Sven Schwermer <[email protected]> +*/ + +#include "regulator_common.h" +#include <common.h> +#include <power/regulator.h> + +int regulator_common_ofdata_to_platdata (struct udevice *dev, + struct regulator_common_platdata *dev_pdata, const char
*enable_gpio_name) +{drivers/power/regulator/regulator_common.c new file +10
-0+struct gpio_desc *gpio; +int flags =GPIOD_IS_OUT ; +int ret; + +if (dev_read_bool (dev,"enable-active-high" )) + flags |=GPIOD_IS_OUT_ACTIVE ; + +/* Get optional enable GPIO desc */ + gpio = &dev_pdata->gpio; + ret = gpio_request_by_name(dev, enable_gpio_name, 0, gpio,flags);
drivers/power/regulator/regulator_common.c new file +2
-0+if (ret) { + debug("Regulator '%s' optional enable GPIO - notfound! Error: %d\n",
drivers/power/regulator/regulator_common.c new file +8
-0+ dev->name, ret); +if (ret != -ENOENT ) +return ret; + } + +/* Get optional ramp up delay */ + dev_pdata->startup_delay_us = dev_read_u32_default(dev, + "startup-delay-us",0);
drivers/power/regulator/regulator_common.c new file +2
-0+ dev_pdata->off_on_delay_us = + dev_read_u32_default(dev,"u-boot,off-on-delay-us", 0); +
drivers/power/regulator/regulator_common.c new file +19
-0+return 0 ; +} + +int regulator_common_get_enable (const struct udevice *dev, +struct regulator_common_platdata *dev_pdata) +{ +/* Enable GPIO is optional */ +if (!dev_pdata->gpio.dev) +return true; + +return dm_gpio_get_value (&dev_pdata->gpio); +} + +int regulator_common_set_enable (const struct udevice *dev, +struct regulator_common_platdata *dev_pdata,bool enable) +{ +int ret; + + debug("%s: dev='%s', enable=%d, delay=%d, has_gpio=%d\n",
__func__,drivers/power/regulator/regulator_common.c new file +12
-0+ dev->name, enable, dev_pdata->startup_delay_us, + dm_gpio_is_valid(&dev_pdata->gpio)); +/* Enable GPIO is optional */ +if (!dm_gpio_is_valid (&dev_pdata->gpio)) { +if (!enable) +return -ENOSYS ; +return 0 ; + } + + ret =dm_gpio_set_value (&dev_pdata->gpio, enable); +if (ret) { + pr_err("Can't set regulator : %s gpio to: %d\n",
dev->name,drivers/power/regulator/regulator_common.c new file +13
-0+ enable); +return ret; + } + +if (enable && dev_pdata->startup_delay_us) +udelay (dev_pdata->startup_delay_us); +debug ("%s: done\n" , __func__); + +if (!enable && dev_pdata->off_on_delay_us) +udelay (dev_pdata->off_on_delay_us); + +return 0 ; +}(quoted diff) +0
-0
b/drivers/power/regulator/regulator_common.hnew file mode 100644 index 0000000000..18a525880adrivers/power/regulator/regulator_common.h new file +15
-0@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2019 Disruptive Technologies Research AS +* Sven Schwermer <[email protected]> +*/ + +#ifndef _REGULATOR_COMMON_H +#define _REGULATOR_COMMON_H + +#include <common.h> +#include <asm/gpio.h> +#include <dm.h> + +struct regulator_common_platdata { + struct gpio_desc gpio; /* GPIO for regulator enable control*/
drivers/power/regulator/regulator_common.h new file +6
-0+unsigned int startup_delay_us; +unsigned int off_on_delay_us; +}; + +int regulator_common_ofdata_to_platdata (struct udevice *dev, + struct regulator_common_platdata *dev_pdata, const char
*enable_gpio_name); +int regulator_common_get_enable(const struct udevice *dev,
drivers/power/regulator/regulator_common.h line 27
Quoted 5 lines
drivers/power/regulator/regulator_common.h new file +5
-0+ struct regulator_common_platdata *dev_pdata); +int regulator_common_set_enable (const struct udevice *dev, +struct regulator_common_platdata *dev_pdata,bool enable); + +#endif /* _REGULATOR_COMMON_H */
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190628/2330a7dc/attachment.sig>
PATCH v2 1/2 regulator: Factor out common enable code
In reply to sven at svenschwermer.deQuoted 8 lines · sven at svenschwermer.de
From: Sven Schwermer <[email protected]>
In preparation of being able to enable/disable GPIO regulators, the code that will be shared among the two kinds to regulators is factored out into its own source files.
Signed-off-by Sven Schwermer <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190718/53cc54db/attachment.sig>