linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] power: suppy: ucs1002: disable power when max current is 0
@ 2019-11-19 17:00 Lucas Stach
  2019-11-22 20:25 ` Chris Healy
  0 siblings, 1 reply; 3+ messages in thread
From: Lucas Stach @ 2019-11-19 17:00 UTC (permalink / raw)
  To: Sebastian Reichel
  Cc: linux-pm, Chris Healy, Andrey Smirnov, kernel, patchwork-lst

For some devices userspace needs the ability to completely cut the power
to the USB devices connected to the charge controller. An easy way to
achieve this is by allowing 0 as a valid max current and forcibly disable
the output in that case, as well as enable it again if the regulator is
in use and a non-0 max current is set.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/power/supply/ucs1002_power.c | 42 +++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/ucs1002_power.c
index 1b80ae479e7d..0ca80d00b80a 100644
--- a/drivers/power/supply/ucs1002_power.c
+++ b/drivers/power/supply/ucs1002_power.c
@@ -100,7 +100,9 @@ struct ucs1002_info {
 	struct i2c_client *client;
 	struct regmap *regmap;
 	struct regulator_desc *regulator_descriptor;
+	struct regulator_dev *rdev;
 	bool present;
+	bool output_disable;
 };
 
 static enum power_supply_property ucs1002_props[] = {
@@ -233,6 +235,11 @@ static int ucs1002_get_max_current(struct ucs1002_info *info,
 	unsigned int reg;
 	int ret;
 
+	if (info->output_disable) {
+		val->intval = 0;
+		return 0;
+	}
+
 	ret = regmap_read(info->regmap, UCS1002_REG_ILIMIT, &reg);
 	if (ret)
 		return ret;
@@ -247,6 +254,12 @@ static int ucs1002_set_max_current(struct ucs1002_info *info, u32 val)
 	unsigned int reg;
 	int ret, idx;
 
+	if (val == 0) {
+		info->output_disable = true;
+		regulator_disable_regmap(info->rdev);
+		return 0;
+	}
+
 	for (idx = 0; idx < ARRAY_SIZE(ucs1002_current_limit_uA); idx++) {
 		if (val == ucs1002_current_limit_uA[idx])
 			break;
@@ -270,6 +283,12 @@ static int ucs1002_set_max_current(struct ucs1002_info *info, u32 val)
 	if (reg != idx)
 		return -EINVAL;
 
+	info->output_disable = false;
+
+	if (info->rdev && info->rdev->use_count &&
+	    !regulator_is_enabled_regmap(info->rdev))
+		regulator_enable_regmap(info->rdev);
+
 	return 0;
 }
 
@@ -470,9 +489,24 @@ static irqreturn_t ucs1002_alert_irq(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
+int ucs1002_regulator_enable(struct regulator_dev *rdev)
+{
+	struct ucs1002_info *info = rdev_get_drvdata(rdev);
+
+	/*
+	 * If the output is disabled due to 0 maximum current, just pretend the
+	 * enable did work. The regulator will be enabled as soon as we get a
+	 * a non-zero maximum current budget.
+	 */
+	if (info->output_disable)
+		return 0;
+
+	return regulator_enable_regmap(rdev);
+}
+
 static const struct regulator_ops ucs1002_regulator_ops = {
 	.is_enabled	= regulator_is_enabled_regmap,
-	.enable		= regulator_enable_regmap,
+	.enable		= ucs1002_regulator_enable,
 	.disable	= regulator_disable_regmap,
 };
 
@@ -499,7 +533,6 @@ static int ucs1002_probe(struct i2c_client *client,
 	};
 	struct regulator_config regulator_config = {};
 	int irq_a_det, irq_alert, ret;
-	struct regulator_dev *rdev;
 	struct ucs1002_info *info;
 	unsigned int regval;
 
@@ -589,10 +622,11 @@ static int ucs1002_probe(struct i2c_client *client,
 	regulator_config.dev = dev;
 	regulator_config.of_node = dev->of_node;
 	regulator_config.regmap = info->regmap;
+	regulator_config.driver_data = info;
 
-	rdev = devm_regulator_register(dev, info->regulator_descriptor,
+	info->rdev = devm_regulator_register(dev, info->regulator_descriptor,
 				       &regulator_config);
-	ret = PTR_ERR_OR_ZERO(rdev);
+	ret = PTR_ERR_OR_ZERO(info->rdev);
 	if (ret) {
 		dev_err(dev, "Failed to register VBUS regulator: %d\n", ret);
 		return ret;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] power: suppy: ucs1002: disable power when max current is 0
  2019-11-19 17:00 [PATCH] power: suppy: ucs1002: disable power when max current is 0 Lucas Stach
@ 2019-11-22 20:25 ` Chris Healy
  2019-12-19  0:19   ` Sebastian Reichel
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Healy @ 2019-11-22 20:25 UTC (permalink / raw)
  To: Lucas Stach
  Cc: Sebastian Reichel, linux-pm, Andrey Smirnov,
	Pengutronix Kernel Team, patchwork-lst

Tested-by: Chris Healy <cphealy@gmail.com>

On Tue, Nov 19, 2019 at 9:00 AM Lucas Stach <l.stach@pengutronix.de> wrote:
>
> For some devices userspace needs the ability to completely cut the power
> to the USB devices connected to the charge controller. An easy way to
> achieve this is by allowing 0 as a valid max current and forcibly disable
> the output in that case, as well as enable it again if the regulator is
> in use and a non-0 max current is set.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/power/supply/ucs1002_power.c | 42 +++++++++++++++++++++++++---
>  1 file changed, 38 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/ucs1002_power.c
> index 1b80ae479e7d..0ca80d00b80a 100644
> --- a/drivers/power/supply/ucs1002_power.c
> +++ b/drivers/power/supply/ucs1002_power.c
> @@ -100,7 +100,9 @@ struct ucs1002_info {
>         struct i2c_client *client;
>         struct regmap *regmap;
>         struct regulator_desc *regulator_descriptor;
> +       struct regulator_dev *rdev;
>         bool present;
> +       bool output_disable;
>  };
>
>  static enum power_supply_property ucs1002_props[] = {
> @@ -233,6 +235,11 @@ static int ucs1002_get_max_current(struct ucs1002_info *info,
>         unsigned int reg;
>         int ret;
>
> +       if (info->output_disable) {
> +               val->intval = 0;
> +               return 0;
> +       }
> +
>         ret = regmap_read(info->regmap, UCS1002_REG_ILIMIT, &reg);
>         if (ret)
>                 return ret;
> @@ -247,6 +254,12 @@ static int ucs1002_set_max_current(struct ucs1002_info *info, u32 val)
>         unsigned int reg;
>         int ret, idx;
>
> +       if (val == 0) {
> +               info->output_disable = true;
> +               regulator_disable_regmap(info->rdev);
> +               return 0;
> +       }
> +
>         for (idx = 0; idx < ARRAY_SIZE(ucs1002_current_limit_uA); idx++) {
>                 if (val == ucs1002_current_limit_uA[idx])
>                         break;
> @@ -270,6 +283,12 @@ static int ucs1002_set_max_current(struct ucs1002_info *info, u32 val)
>         if (reg != idx)
>                 return -EINVAL;
>
> +       info->output_disable = false;
> +
> +       if (info->rdev && info->rdev->use_count &&
> +           !regulator_is_enabled_regmap(info->rdev))
> +               regulator_enable_regmap(info->rdev);
> +
>         return 0;
>  }
>
> @@ -470,9 +489,24 @@ static irqreturn_t ucs1002_alert_irq(int irq, void *data)
>         return IRQ_HANDLED;
>  }
>
> +int ucs1002_regulator_enable(struct regulator_dev *rdev)
> +{
> +       struct ucs1002_info *info = rdev_get_drvdata(rdev);
> +
> +       /*
> +        * If the output is disabled due to 0 maximum current, just pretend the
> +        * enable did work. The regulator will be enabled as soon as we get a
> +        * a non-zero maximum current budget.
> +        */
> +       if (info->output_disable)
> +               return 0;
> +
> +       return regulator_enable_regmap(rdev);
> +}
> +
>  static const struct regulator_ops ucs1002_regulator_ops = {
>         .is_enabled     = regulator_is_enabled_regmap,
> -       .enable         = regulator_enable_regmap,
> +       .enable         = ucs1002_regulator_enable,
>         .disable        = regulator_disable_regmap,
>  };
>
> @@ -499,7 +533,6 @@ static int ucs1002_probe(struct i2c_client *client,
>         };
>         struct regulator_config regulator_config = {};
>         int irq_a_det, irq_alert, ret;
> -       struct regulator_dev *rdev;
>         struct ucs1002_info *info;
>         unsigned int regval;
>
> @@ -589,10 +622,11 @@ static int ucs1002_probe(struct i2c_client *client,
>         regulator_config.dev = dev;
>         regulator_config.of_node = dev->of_node;
>         regulator_config.regmap = info->regmap;
> +       regulator_config.driver_data = info;
>
> -       rdev = devm_regulator_register(dev, info->regulator_descriptor,
> +       info->rdev = devm_regulator_register(dev, info->regulator_descriptor,
>                                        &regulator_config);
> -       ret = PTR_ERR_OR_ZERO(rdev);
> +       ret = PTR_ERR_OR_ZERO(info->rdev);
>         if (ret) {
>                 dev_err(dev, "Failed to register VBUS regulator: %d\n", ret);
>                 return ret;
> --
> 2.20.1
>

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] power: suppy: ucs1002: disable power when max current is 0
  2019-11-22 20:25 ` Chris Healy
@ 2019-12-19  0:19   ` Sebastian Reichel
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Reichel @ 2019-12-19  0:19 UTC (permalink / raw)
  To: Chris Healy
  Cc: Lucas Stach, linux-pm, Andrey Smirnov, Pengutronix Kernel Team,
	patchwork-lst

[-- Attachment #1: Type: text/plain, Size: 4725 bytes --]

Hi,

On Fri, Nov 22, 2019 at 12:25:28PM -0800, Chris Healy wrote:
> On Tue, Nov 19, 2019 at 9:00 AM Lucas Stach <l.stach@pengutronix.de> wrote:
> >
> > For some devices userspace needs the ability to completely cut the power
> > to the USB devices connected to the charge controller. An easy way to
> > achieve this is by allowing 0 as a valid max current and forcibly disable
> > the output in that case, as well as enable it again if the regulator is
> > in use and a non-0 max current is set.
> >
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
>
> Tested-by: Chris Healy <cphealy@gmail.com>

Thanks, queued to power-supply's for-next branch.

-- Sebastian

> >  drivers/power/supply/ucs1002_power.c | 42 +++++++++++++++++++++++++---
> >  1 file changed, 38 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/ucs1002_power.c
> > index 1b80ae479e7d..0ca80d00b80a 100644
> > --- a/drivers/power/supply/ucs1002_power.c
> > +++ b/drivers/power/supply/ucs1002_power.c
> > @@ -100,7 +100,9 @@ struct ucs1002_info {
> >         struct i2c_client *client;
> >         struct regmap *regmap;
> >         struct regulator_desc *regulator_descriptor;
> > +       struct regulator_dev *rdev;
> >         bool present;
> > +       bool output_disable;
> >  };
> >
> >  static enum power_supply_property ucs1002_props[] = {
> > @@ -233,6 +235,11 @@ static int ucs1002_get_max_current(struct ucs1002_info *info,
> >         unsigned int reg;
> >         int ret;
> >
> > +       if (info->output_disable) {
> > +               val->intval = 0;
> > +               return 0;
> > +       }
> > +
> >         ret = regmap_read(info->regmap, UCS1002_REG_ILIMIT, &reg);
> >         if (ret)
> >                 return ret;
> > @@ -247,6 +254,12 @@ static int ucs1002_set_max_current(struct ucs1002_info *info, u32 val)
> >         unsigned int reg;
> >         int ret, idx;
> >
> > +       if (val == 0) {
> > +               info->output_disable = true;
> > +               regulator_disable_regmap(info->rdev);
> > +               return 0;
> > +       }
> > +
> >         for (idx = 0; idx < ARRAY_SIZE(ucs1002_current_limit_uA); idx++) {
> >                 if (val == ucs1002_current_limit_uA[idx])
> >                         break;
> > @@ -270,6 +283,12 @@ static int ucs1002_set_max_current(struct ucs1002_info *info, u32 val)
> >         if (reg != idx)
> >                 return -EINVAL;
> >
> > +       info->output_disable = false;
> > +
> > +       if (info->rdev && info->rdev->use_count &&
> > +           !regulator_is_enabled_regmap(info->rdev))
> > +               regulator_enable_regmap(info->rdev);
> > +
> >         return 0;
> >  }
> >
> > @@ -470,9 +489,24 @@ static irqreturn_t ucs1002_alert_irq(int irq, void *data)
> >         return IRQ_HANDLED;
> >  }
> >
> > +int ucs1002_regulator_enable(struct regulator_dev *rdev)
> > +{
> > +       struct ucs1002_info *info = rdev_get_drvdata(rdev);
> > +
> > +       /*
> > +        * If the output is disabled due to 0 maximum current, just pretend the
> > +        * enable did work. The regulator will be enabled as soon as we get a
> > +        * a non-zero maximum current budget.
> > +        */
> > +       if (info->output_disable)
> > +               return 0;
> > +
> > +       return regulator_enable_regmap(rdev);
> > +}
> > +
> >  static const struct regulator_ops ucs1002_regulator_ops = {
> >         .is_enabled     = regulator_is_enabled_regmap,
> > -       .enable         = regulator_enable_regmap,
> > +       .enable         = ucs1002_regulator_enable,
> >         .disable        = regulator_disable_regmap,
> >  };
> >
> > @@ -499,7 +533,6 @@ static int ucs1002_probe(struct i2c_client *client,
> >         };
> >         struct regulator_config regulator_config = {};
> >         int irq_a_det, irq_alert, ret;
> > -       struct regulator_dev *rdev;
> >         struct ucs1002_info *info;
> >         unsigned int regval;
> >
> > @@ -589,10 +622,11 @@ static int ucs1002_probe(struct i2c_client *client,
> >         regulator_config.dev = dev;
> >         regulator_config.of_node = dev->of_node;
> >         regulator_config.regmap = info->regmap;
> > +       regulator_config.driver_data = info;
> >
> > -       rdev = devm_regulator_register(dev, info->regulator_descriptor,
> > +       info->rdev = devm_regulator_register(dev, info->regulator_descriptor,
> >                                        &regulator_config);
> > -       ret = PTR_ERR_OR_ZERO(rdev);
> > +       ret = PTR_ERR_OR_ZERO(info->rdev);
> >         if (ret) {
> >                 dev_err(dev, "Failed to register VBUS regulator: %d\n", ret);
> >                 return ret;
> > --
> > 2.20.1
> >

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-19  0:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-19 17:00 [PATCH] power: suppy: ucs1002: disable power when max current is 0 Lucas Stach
2019-11-22 20:25 ` Chris Healy
2019-12-19  0:19   ` Sebastian Reichel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).