Re: [U-Boot] [PATCH v2 1/2] regulator: Factor out common enable code

On Mon, 24 Jun 2019 13:03:33 +0200 sven@svenschwermer.de wrote:

From: Sven Schwermer sven@svenschwermer.de

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 sven@svenschwermer.de

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

diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 72dfc48981..e0b8398ef4 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -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. diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index 8c1506c88e..e728b73aee 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -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 diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index a99aa78310..763e671d54 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -5,56 +5,26 @@

• Przemyslaw Marczak p.marczak@samsung.com

*/

+#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); -

• return 0;

• return regulator_common_ofdata_to_platdata(dev, dev_pdata,

"gpio"); }

static int fixed_regulator_get_value(struct udevice *dev) @@ -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); -

• /* 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) {

• struct fixed_regulator_platdata *dev_pdata =

dev_get_platdata(dev);

• int ret;
• debug("%s: dev='%s', enable=%d, delay=%d, has_gpio=%d\n",

__func__,

•      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,

•       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_ops fixed_regulator_ops = { @@ -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), }; diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c new file mode 100644 index 0000000000..3dabbe2a85 --- /dev/null +++ b/drivers/power/regulator/regulator_common.c @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

• • Copyright (C) 2019 Disruptive Technologies Research AS
• • Sven Schwermer sven.svenschwermer@disruptive-technologies.com
• */

+#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) +{

• 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);

• if (ret) {

• debug("Regulator '%s' optional enable GPIO - not
  

found! Error: %d\n",

•       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);

• dev_pdata->off_on_delay_us =

• 	dev_read_u32_default(dev,
  

"u-boot,off-on-delay-us", 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__,

•      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,

•       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;

+} diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h new file mode 100644 index 0000000000..18a525880a --- /dev/null +++ b/drivers/power/regulator/regulator_common.h @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

• • Copyright (C) 2019 Disruptive Technologies Research AS
• • Sven Schwermer sven.svenschwermer@disruptive-technologies.com
• */

+#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 */

Reviewed-by: Lukasz Majewski lukma@denx.de

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@denx.de