* [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case
@ 2019-09-26 5:51 Axel Lin
2019-09-26 5:51 ` [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode " Axel Lin
2019-09-26 9:22 ` [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Adam Thomson
0 siblings, 2 replies; 6+ messages in thread
From: Axel Lin @ 2019-09-26 5:51 UTC (permalink / raw)
To: Mark Brown
Cc: Adam Thomson, Support Opensource, Liam Girdwood, linux-kernel, Axel Lin
The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
the logic as the result is the same.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/da9062-regulator.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/da9062-regulator.c b/drivers/regulator/da9062-regulator.c
index 710e67081d53..739a40f256f6 100644
--- a/drivers/regulator/da9062-regulator.c
+++ b/drivers/regulator/da9062-regulator.c
@@ -136,7 +136,7 @@ static int da9062_buck_set_mode(struct regulator_dev *rdev, unsigned mode)
static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)
{
struct da9062_regulator *regl = rdev_get_drvdata(rdev);
- unsigned int val, mode = 0;
+ unsigned int val;
int ret;
ret = regmap_field_read(regl->mode, &val);
@@ -146,7 +146,6 @@ static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)
switch (val) {
default:
case BUCK_MODE_MANUAL:
- mode = REGULATOR_MODE_FAST | REGULATOR_MODE_STANDBY;
/* Sleep flag bit decides the mode */
break;
case BUCK_MODE_SLEEP:
@@ -162,11 +161,9 @@ static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)
return 0;
if (val)
- mode &= REGULATOR_MODE_STANDBY;
+ return REGULATOR_MODE_STANDBY;
else
- mode &= REGULATOR_MODE_NORMAL | REGULATOR_MODE_FAST;
-
- return mode;
+ return REGULATOR_MODE_FAST;
}
/*
--
2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case
2019-09-26 5:51 [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Axel Lin
@ 2019-09-26 5:51 ` Axel Lin
2019-09-26 9:23 ` Adam Thomson
2019-10-01 11:40 ` Applied "regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case" to the regulator tree Mark Brown
2019-09-26 9:22 ` [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Adam Thomson
1 sibling, 2 replies; 6+ messages in thread
From: Axel Lin @ 2019-09-26 5:51 UTC (permalink / raw)
To: Mark Brown
Cc: Adam Thomson, Support Opensource, Liam Girdwood, linux-kernel, Axel Lin
The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
the logic as the result is the same.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/da9063-regulator.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index 28b1b20f45bd..2aceb3b7afc2 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -225,7 +225,7 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
{
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
struct regmap_field *field;
- unsigned int val, mode = 0;
+ unsigned int val;
int ret;
ret = regmap_field_read(regl->mode, &val);
@@ -235,7 +235,6 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
switch (val) {
default:
case BUCK_MODE_MANUAL:
- mode = REGULATOR_MODE_FAST | REGULATOR_MODE_STANDBY;
/* Sleep flag bit decides the mode */
break;
case BUCK_MODE_SLEEP:
@@ -262,11 +261,9 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
return 0;
if (val)
- mode &= REGULATOR_MODE_STANDBY;
+ return REGULATOR_MODE_STANDBY;
else
- mode &= REGULATOR_MODE_NORMAL | REGULATOR_MODE_FAST;
-
- return mode;
+ return REGULATOR_MODE_FAST;
}
/*
--
2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case
2019-09-26 5:51 ` [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode " Axel Lin
@ 2019-09-26 9:23 ` Adam Thomson
2019-10-01 11:40 ` Applied "regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case" to the regulator tree Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Adam Thomson @ 2019-09-26 9:23 UTC (permalink / raw)
To: Axel Lin, Mark Brown
Cc: Adam Thomson, Support Opensource, Liam Girdwood, linux-kernel
On 26 September 2019 06:51, Axel Lin wrote:
> The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
> the logic as the result is the same.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
> drivers/regulator/da9063-regulator.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-
> regulator.c
> index 28b1b20f45bd..2aceb3b7afc2 100644
> --- a/drivers/regulator/da9063-regulator.c
> +++ b/drivers/regulator/da9063-regulator.c
> @@ -225,7 +225,7 @@ static unsigned da9063_buck_get_mode(struct
> regulator_dev *rdev)
> {
> struct da9063_regulator *regl = rdev_get_drvdata(rdev);
> struct regmap_field *field;
> - unsigned int val, mode = 0;
> + unsigned int val;
> int ret;
>
> ret = regmap_field_read(regl->mode, &val);
> @@ -235,7 +235,6 @@ static unsigned da9063_buck_get_mode(struct
> regulator_dev *rdev)
> switch (val) {
> default:
> case BUCK_MODE_MANUAL:
> - mode = REGULATOR_MODE_FAST |
> REGULATOR_MODE_STANDBY;
> /* Sleep flag bit decides the mode */
> break;
> case BUCK_MODE_SLEEP:
> @@ -262,11 +261,9 @@ static unsigned da9063_buck_get_mode(struct
> regulator_dev *rdev)
> return 0;
>
> if (val)
> - mode &= REGULATOR_MODE_STANDBY;
> + return REGULATOR_MODE_STANDBY;
> else
> - mode &= REGULATOR_MODE_NORMAL |
> REGULATOR_MODE_FAST;
> -
> - return mode;
> + return REGULATOR_MODE_FAST;
> }
>
> /*
> --
> 2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Applied "regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case" to the regulator tree
2019-09-26 5:51 ` [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode " Axel Lin
2019-09-26 9:23 ` Adam Thomson
@ 2019-10-01 11:40 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2019-10-01 11:40 UTC (permalink / raw)
To: Axel Lin
Cc: Adam Thomson, Liam Girdwood, linux-kernel, Mark Brown,
Support Opensource
The patch
regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.5
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From e62cb0e0002ceb1a761b4dd7bb6a2bfc77a1ae77 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 26 Sep 2019 13:51:28 +0800
Subject: [PATCH] regulator: da9063: Simplify da9063_buck_set_mode for
BUCK_MODE_MANUAL case
The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
the logic as the result is the same.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Link: https://lore.kernel.org/r/20190926055128.23434-2-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/regulator/da9063-regulator.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index 28b1b20f45bd..2aceb3b7afc2 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -225,7 +225,7 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
{
struct da9063_regulator *regl = rdev_get_drvdata(rdev);
struct regmap_field *field;
- unsigned int val, mode = 0;
+ unsigned int val;
int ret;
ret = regmap_field_read(regl->mode, &val);
@@ -235,7 +235,6 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
switch (val) {
default:
case BUCK_MODE_MANUAL:
- mode = REGULATOR_MODE_FAST | REGULATOR_MODE_STANDBY;
/* Sleep flag bit decides the mode */
break;
case BUCK_MODE_SLEEP:
@@ -262,11 +261,9 @@ static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
return 0;
if (val)
- mode &= REGULATOR_MODE_STANDBY;
+ return REGULATOR_MODE_STANDBY;
else
- mode &= REGULATOR_MODE_NORMAL | REGULATOR_MODE_FAST;
-
- return mode;
+ return REGULATOR_MODE_FAST;
}
/*
--
2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case
2019-09-26 5:51 [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Axel Lin
2019-09-26 5:51 ` [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode " Axel Lin
@ 2019-09-26 9:22 ` Adam Thomson
2019-10-01 11:52 ` Axel Lin
1 sibling, 1 reply; 6+ messages in thread
From: Adam Thomson @ 2019-09-26 9:22 UTC (permalink / raw)
To: Axel Lin, Mark Brown
Cc: Adam Thomson, Support Opensource, Liam Girdwood, linux-kernel
On 26 September 2019 06:51, Axel Lin wrote:
> The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
> the logic as the result is the same.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
This patch will need to be rebased on Marco's update titled:
"regulator: da9062: fix suspend_enable/disable preparation"
However, changes look fine so:
Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
> drivers/regulator/da9062-regulator.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/regulator/da9062-regulator.c b/drivers/regulator/da9062-
> regulator.c
> index 710e67081d53..739a40f256f6 100644
> --- a/drivers/regulator/da9062-regulator.c
> +++ b/drivers/regulator/da9062-regulator.c
> @@ -136,7 +136,7 @@ static int da9062_buck_set_mode(struct regulator_dev
> *rdev, unsigned mode)
> static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)
> {
> struct da9062_regulator *regl = rdev_get_drvdata(rdev);
> - unsigned int val, mode = 0;
> + unsigned int val;
> int ret;
>
> ret = regmap_field_read(regl->mode, &val);
> @@ -146,7 +146,6 @@ static unsigned da9062_buck_get_mode(struct
> regulator_dev *rdev)
> switch (val) {
> default:
> case BUCK_MODE_MANUAL:
> - mode = REGULATOR_MODE_FAST |
> REGULATOR_MODE_STANDBY;
> /* Sleep flag bit decides the mode */
> break;
> case BUCK_MODE_SLEEP:
> @@ -162,11 +161,9 @@ static unsigned da9062_buck_get_mode(struct
> regulator_dev *rdev)
> return 0;
>
> if (val)
> - mode &= REGULATOR_MODE_STANDBY;
> + return REGULATOR_MODE_STANDBY;
> else
> - mode &= REGULATOR_MODE_NORMAL |
> REGULATOR_MODE_FAST;
> -
> - return mode;
> + return REGULATOR_MODE_FAST;
> }
>
> /*
> --
> 2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case
2019-09-26 9:22 ` [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Adam Thomson
@ 2019-10-01 11:52 ` Axel Lin
0 siblings, 0 replies; 6+ messages in thread
From: Axel Lin @ 2019-10-01 11:52 UTC (permalink / raw)
To: Adam Thomson; +Cc: Mark Brown, Support Opensource, Liam Girdwood, linux-kernel
Adam Thomson <Adam.Thomson.Opensource@diasemi.com> 於 2019年9月26日 週四 下午5:22寫道：
>
> On 26 September 2019 06:51, Axel Lin wrote:
>
> > The sleep flag bit decides the mode for BUCK_MODE_MANUAL case, simplify
> > the logic as the result is the same.
> >
> > Signed-off-by: Axel Lin <axel.lin@ingics.com>
>
> This patch will need to be rebased on Marco's update titled:
>
> "regulator: da9062: fix suspend_enable/disable preparation"
This patch is on top of above commit.
Should be applied cleanly.
Thanks,
Axel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-01 11:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-26 5:51 [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Axel Lin
2019-09-26 5:51 ` [PATCH 2/2] regulator: da9063: Simplify da9063_buck_set_mode " Axel Lin
2019-09-26 9:23 ` Adam Thomson
2019-10-01 11:40 ` Applied "regulator: da9063: Simplify da9063_buck_set_mode for BUCK_MODE_MANUAL case" to the regulator tree Mark Brown
2019-09-26 9:22 ` [PATCH 1/2] regulator: da9062: Simplify da9062_buck_set_mode for BUCK_MODE_MANUAL case Adam Thomson
2019-10-01 11:52 ` Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®