regulator da9062: support setting buck modes
Subsystems (5)
v2 cover regulator da9062: support setting buck modes
This patchset adds of_map_mode support to regulator da9062, documents its bindings and makes use of it in dts phycore-imx6 so that buck modes get configured explicitly for this hardware.
Changes in v2:
- rename defines (and header filename) from 906X to 9063
- explain usage of name da9063 in changelog
- rename da906x_map_buck_mode() to da9062_map_buck_mode()
- rebase patchset on top of next-20191113
- adapt subject line of dt-bindings patch to reflect changes in mfd sub-system
Christoph Fritz (4):
regulator: da9062: refactor buck modes into header
regulator: da9062: add of_map_mode support for bucks
dt-bindings: mfd: da9062: describe buck modes
ARM: dts: phycore-imx6: set buck regulator modes explicitly
Documentation/devicetree/bindings/mfd/da9062.txt | 4 ++ arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 +++ drivers/regulator/da9062-regulator.c | 49 ++++++++++++++-------- .../dt-bindings/regulator/dlg,da9063-regulator.h | 16 +++++++ 4 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h
Signature · 1 line
2.1.4
PATCH v2 1/4 regulator: da9062: refactor buck modes into header
This patch refactors buck modes into a header file so that device trees can make use of these mode constants.
The new header filename uses da9063 because DA9063 was the earlier chip and its driver code will want updating at some point in a similar manner.
--- drivers/regulator/da9062-regulator.c | 28 ++++++++-------------- .../dt-bindings/regulator/dlg,da9063-regulator.h | 16 +++++++++++++ 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h
drivers/regulator/da9062-regulator.c +10 -18
@@ -16,6 +16,7 @@#include <linux/regulator/of_regulator.h> #include <linux/mfd/da9062/core.h> #include <linux/mfd/da9062/registers.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> /* Regulator IDs */ enum {
@@ -75,14 +76,6 @@ struct da9062_regulators {struct da9062_regulator regulator[0 ]; }; -/* BUCK modes */ -enum { -BUCK_MODE_MANUAL ,/* 0 */ -BUCK_MODE_SLEEP ,/* 1 */ -BUCK_MODE_SYNC ,/* 2 */ -BUCK_MODE_AUTO /* 3 */ -}; -/* Regulator operations */ /* Current limits array (in uA)
@@ -112,13 +105,13 @@ static int da9062_buck_set_mode(struct regulator_dev *rdev, unsigned mode)switch (mode) {case REGULATOR_MODE_FAST : - val =BUCK_MODE_SYNC ; + val =DA9063_BUCK_MODE_SYNC ;break ;case REGULATOR_MODE_NORMAL : - val =BUCK_MODE_AUTO ; + val =DA9063_BUCK_MODE_AUTO ;break ;case REGULATOR_MODE_STANDBY : - val =BUCK_MODE_SLEEP ; + val =DA9063_BUCK_MODE_SLEEP ;break ;default :return -EINVAL ;
@@ -145,14 +138,13 @@ static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)switch (val) {default : -case BUCK_MODE_MANUAL :/* Sleep flag bit decides the mode */ break ; -case BUCK_MODE_SLEEP : +case DA9063_BUCK_MODE_SLEEP :return REGULATOR_MODE_STANDBY ; -case BUCK_MODE_SYNC : +case DA9063_BUCK_MODE_SYNC :return REGULATOR_MODE_FAST ; -case BUCK_MODE_AUTO : +case DA9063_BUCK_MODE_AUTO :return REGULATOR_MODE_NORMAL ; }
@@ -279,13 +271,13 @@ static int da9062_buck_set_suspend_mode(struct regulator_dev *rdev,switch (mode) {case REGULATOR_MODE_FAST : - val =BUCK_MODE_SYNC ; + val =DA9063_BUCK_MODE_SYNC ;break ;case REGULATOR_MODE_NORMAL : - val =BUCK_MODE_AUTO ; + val =DA9063_BUCK_MODE_AUTO ;break ;case REGULATOR_MODE_STANDBY : - val =BUCK_MODE_SLEEP ; + val =DA9063_BUCK_MODE_SLEEP ;break ;default :return -EINVAL ;
include/dt-bindings/regulator/dlg,da9063-regulator.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _DT_BINDINGS_REGULATOR_DLG_DA9063_H +#define _DT_BINDINGS_REGULATOR_DLG_DA9063_H + +/* +* These buck mode constants may be used to specify values in device tree +* properties (e.g. regulator-initial-mode). +* A description of the following modes is in the manufacturers datasheet. +*/ + +#define DA9063_BUCK_MODE_SLEEP 1 +#define DA9063_BUCK_MODE_SYNC 2 +#define DA9063_BUCK_MODE_AUTO 3 + +#endif
Signature · 1 line
2.1.4
RE: [PATCH v2 1/4] regulator: da9062: refactor buck modes into header
Quoted 7 lines · Christoph Fritz
This patch refactors buck modes into a header file so that device trees can make use of these mode constants.
The new header filename uses da9063 because DA9063 was the earlier chip and its driver code will want updating at some point in a similar manner.
Signed-off-by Christoph Fritz <[email protected]>
Quoted 114 lines
--- drivers/regulator/da9062-regulator.c | 28 ++++++++-------------- .../dt-bindings/regulator/dlg,da9063-regulator.h | 16 +++++++++++++ 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.hdrivers/regulator/da9062- renamed from drivers/regulator/da9062-regulator.c +0
-0
regulator.c
index 4b24518..601002e 100644drivers/regulator/da9062-regulator.c +4
-11@@ -16,6 +16,7 @@#include <linux/regulator/of_regulator.h> #include <linux/mfd/da9062/core.h> #include <linux/mfd/da9062/registers.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> /* Regulator IDs */ enum {@@ -75,14 +76,6 @@ struct da9062_regulators {struct da9062_regulator regulator[0 ]; }; -/* BUCK modes */ -enum { -BUCK_MODE_MANUAL ,/* 0 */ -BUCK_MODE_SLEEP ,/* 1 */ -BUCK_MODE_SYNC ,/* 2 */ -BUCK_MODE_AUTO /* 3 */ -}; -/* Regulator operations */ /* Current limits array (in uA) @@ -112,13 +105,13 @@ static int da9062_buck_set_mode(struct regulator_dev *rdev, unsigned mode)switch (mode) {case REGULATOR_MODE_FAST : - val =BUCK_MODE_SYNC ; + val =DA9063_BUCK_MODE_SYNC ;break ;case REGULATOR_MODE_NORMAL : - val =BUCK_MODE_AUTO ; + val =DA9063_BUCK_MODE_AUTO ;break ;case REGULATOR_MODE_STANDBY : - val =BUCK_MODE_SLEEP ; + val =DA9063_BUCK_MODE_SLEEP ;break ;default :drivers/regulator/da9062-regulator.c +6
-7return -EINVAL ;@@ -145,14 +138,13 @@ static unsigned da9062_buck_get_mode(struct regulator_dev *rdev) switch (val) {default : -case BUCK_MODE_MANUAL :/* Sleep flag bit decides the mode */ break ; -case BUCK_MODE_SLEEP : +case DA9063_BUCK_MODE_SLEEP :return REGULATOR_MODE_STANDBY ; -case BUCK_MODE_SYNC : +case DA9063_BUCK_MODE_SYNC :return REGULATOR_MODE_FAST ; -case BUCK_MODE_AUTO : +case DA9063_BUCK_MODE_AUTO :return REGULATOR_MODE_NORMAL ; }@@ -279,13 +271,13 @@ static int da9062_buck_set_suspend_mode(struct regulator_dev *rdev, switch (mode) {case REGULATOR_MODE_FAST : - val =BUCK_MODE_SYNC ; + val =DA9063_BUCK_MODE_SYNC ;break ;case REGULATOR_MODE_NORMAL : - val =BUCK_MODE_AUTO ; + val =DA9063_BUCK_MODE_AUTO ;break ;case REGULATOR_MODE_STANDBY : - val =BUCK_MODE_SLEEP ; + val =DA9063_BUCK_MODE_SLEEP ;break ;default :drivers/regulator/da9062-regulator.c +0
-0return -EINVAL ;include/dt- renamed from include/dt-bindings/regulator/dlg,da9063-regulator.h +0
-0
bindings/regulator/dlg,da9063-regulator.h
new file mode 100644
index 00000000..1de710dinclude/dt-bindings/regulator/dlg,da9063-regulator.h new file +16
-1@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _DT_BINDINGS_REGULATOR_DLG_DA9063_H +#define _DT_BINDINGS_REGULATOR_DLG_DA9063_H + +/* +* These buck mode constants may be used to specify values in device tree +* properties (e.g. regulator-initial-mode). +* A description of the following modes is in the manufacturers datasheet. +*/ + +#define DA9063_BUCK_MODE_SLEEP 1 +#define DA9063_BUCK_MODE_SYNC 2 +#define DA9063_BUCK_MODE_AUTO 3 + +#endif --2.1.4
Mark Brown
maintainerApplied "regulator: da9062: refactor buck modes into header" to the regulator tree
In reply to Christoph FritzThe patch
regulator: da9062: refactor buck modes into header
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 7d34aec52d292197d6b13395b023c718cac4630f Mon Sep 17 00:00:00 2001
From: Christoph Fritz <[email protected]>
Date: Wed, 13 Nov 2019 14:40:13 +0100
Subject: [PATCH] regulator: da9062: refactor buck modes into header
This patch refactors buck modes into a header file so that device trees can make use of these mode constants.
The new header filename uses da9063 because DA9063 was the earlier chip and its driver code will want updating at some point in a similar manner.
--- drivers/regulator/da9062-regulator.c | 28 +++++++------------ .../regulator/dlg,da9063-regulator.h | 16 +++++++++++ 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h
drivers/regulator/da9062-regulator.c +10 -18
@@ -16,6 +16,7 @@#include <linux/regulator/of_regulator.h> #include <linux/mfd/da9062/core.h> #include <linux/mfd/da9062/registers.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> /* Regulator IDs */ enum {
@@ -75,14 +76,6 @@ struct da9062_regulators {struct da9062_regulator regulator[0 ]; }; -/* BUCK modes */ -enum { -BUCK_MODE_MANUAL ,/* 0 */ -BUCK_MODE_SLEEP ,/* 1 */ -BUCK_MODE_SYNC ,/* 2 */ -BUCK_MODE_AUTO /* 3 */ -}; -/* Regulator operations */ /* Current limits array (in uA)
@@ -112,13 +105,13 @@ static int da9062_buck_set_mode(struct regulator_dev *rdev, unsigned mode)switch (mode) {case REGULATOR_MODE_FAST : - val =BUCK_MODE_SYNC ; + val =DA9063_BUCK_MODE_SYNC ;break ;case REGULATOR_MODE_NORMAL : - val =BUCK_MODE_AUTO ; + val =DA9063_BUCK_MODE_AUTO ;break ;case REGULATOR_MODE_STANDBY : - val =BUCK_MODE_SLEEP ; + val =DA9063_BUCK_MODE_SLEEP ;break ;default :return -EINVAL ;
@@ -145,14 +138,13 @@ static unsigned da9062_buck_get_mode(struct regulator_dev *rdev)switch (val) {default : -case BUCK_MODE_MANUAL :/* Sleep flag bit decides the mode */ break ; -case BUCK_MODE_SLEEP : +case DA9063_BUCK_MODE_SLEEP :return REGULATOR_MODE_STANDBY ; -case BUCK_MODE_SYNC : +case DA9063_BUCK_MODE_SYNC :return REGULATOR_MODE_FAST ; -case BUCK_MODE_AUTO : +case DA9063_BUCK_MODE_AUTO :return REGULATOR_MODE_NORMAL ; }
@@ -279,13 +271,13 @@ static int da9062_buck_set_suspend_mode(struct regulator_dev *rdev,switch (mode) {case REGULATOR_MODE_FAST : - val =BUCK_MODE_SYNC ; + val =DA9063_BUCK_MODE_SYNC ;break ;case REGULATOR_MODE_NORMAL : - val =BUCK_MODE_AUTO ; + val =DA9063_BUCK_MODE_AUTO ;break ;case REGULATOR_MODE_STANDBY : - val =BUCK_MODE_SLEEP ; + val =DA9063_BUCK_MODE_SLEEP ;break ;default :return -EINVAL ;
include/dt-bindings/regulator/dlg,da9063-regulator.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _DT_BINDINGS_REGULATOR_DLG_DA9063_H +#define _DT_BINDINGS_REGULATOR_DLG_DA9063_H + +/* +* These buck mode constants may be used to specify values in device tree +* properties (e.g. regulator-initial-mode). +* A description of the following modes is in the manufacturers datasheet. +*/ + +#define DA9063_BUCK_MODE_SLEEP 1 +#define DA9063_BUCK_MODE_SYNC 2 +#define DA9063_BUCK_MODE_AUTO 3 + +#endif
Signature · 1 line
2.20.1
PATCH v2 2/4 regulator: da9062: add of_map_mode support for bucks
In reply to Christoph FritzThis patch adds of_map_mode support for bucks to set regulator modes from within regulator framework.
--- drivers/regulator/da9062-regulator.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/regulator/da9062-regulator.c +21 -0
@@ -98,6 +98,20 @@ static const unsigned int da9062_buck_b_limits[] = { 2300000, 2400000, 2500000, 2600000, 2700000, 2800000, 2900000, 3000000 }; +static unsigned int da9062_map_buck_mode (unsigned int mode) +{ +switch (mode) { +case DA9063_BUCK_MODE_SLEEP : +return REGULATOR_MODE_STANDBY ; +case DA9063_BUCK_MODE_SYNC : +return REGULATOR_MODE_FAST ; +case DA9063_BUCK_MODE_AUTO : +return REGULATOR_MODE_NORMAL ; +default : +return -EINVAL ; + } +} +static int da9062_buck_set_mode (struct regulator_dev *rdev,unsigned mode) {struct da9062_regulator *regl =rdev_get_drvdata (rdev);
@@ -360,6 +374,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK1_A, .desc.vsel_mask = DA9062AA_VBUCK1_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK1_A, __builtin_ffs((int)DA9062AA_BUCK1_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -396,6 +411,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK3_A, .desc.vsel_mask = DA9062AA_VBUCK3_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK3_A, __builtin_ffs((int)DA9062AA_BUCK3_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -432,6 +448,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK4_A, .desc.vsel_mask = DA9062AA_VBUCK4_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK4_A, __builtin_ffs((int)DA9062AA_BUCK4_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -604,6 +621,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK1_A, .desc.vsel_mask = DA9062AA_VBUCK1_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK1_A, __builtin_ffs((int)DA9062AA_BUCK1_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -640,6 +658,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK2_A, .desc.vsel_mask = DA9062AA_VBUCK2_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK2_A, __builtin_ffs((int)DA9062AA_BUCK2_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -676,6 +695,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK3_A, .desc.vsel_mask = DA9062AA_VBUCK3_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK3_A, __builtin_ffs((int)DA9062AA_BUCK3_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -712,6 +732,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK4_A, .desc.vsel_mask = DA9062AA_VBUCK4_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK4_A, __builtin_ffs((int)DA9062AA_BUCK4_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
Signature · 1 line
2.1.4
RE: [PATCH v2 2/4] regulator: da9062: add of_map_mode support for bucks
Quoted 6 lines · Christoph Fritz
This patch adds
of_map_modesupport for bucks to set regulator modes from within regulator framework.Signed-off-by Christoph Fritz <[email protected]>Signed-off-by Christian Hemp <[email protected]>Signed-off-by Stefan Riedmueller <[email protected]>
Quoted 95 lines
--- drivers/regulator/da9062-regulator.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/regulator/da9062- renamed from drivers/regulator/da9062-regulator.c +0
-0
regulator.c
index 601002e..29f4a60 100644drivers/regulator/da9062-regulator.c +15
-0@@ -98,6 +98,20 @@ static const unsigned int da9062_buck_b_limits[] = { 2300000, 2400000, 2500000, 2600000, 2700000, 2800000, 2900000, 3000000 }; +static unsigned int da9062_map_buck_mode (unsigned int mode) +{ +switch (mode) { +case DA9063_BUCK_MODE_SLEEP : +return REGULATOR_MODE_STANDBY ; +case DA9063_BUCK_MODE_SYNC : +return REGULATOR_MODE_FAST ; +case DA9063_BUCK_MODE_AUTO : +return REGULATOR_MODE_NORMAL ; +default : +return -EINVAL ; + } +} +static int da9062_buck_set_mode (struct regulator_dev *rdev,unsigned mode) {struct da9062_regulator *regl =rdev_get_drvdata (rdev);@@ -360,6 +374,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK1_A , .desc.vsel_mask =DA9062AA_VBUCK1_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK1_A, __builtin_ffs((int)DA9062AA_BUCK1_SL_A_MASK) - 1,drivers/regulator/da9062-regulator.c +1
-0sizeof(unsigned int) * 8 -@@ -396,6 +411,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK3_A , .desc.vsel_mask =DA9062AA_VBUCK3_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK3_A, __builtin_ffs((int)DA9062AA_BUCK3_SL_A_MASK) - 1,drivers/regulator/da9062-regulator.c +1
-0sizeof(unsigned int) * 8 -@@ -432,6 +448,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK4_A , .desc.vsel_mask =DA9062AA_VBUCK4_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK4_A, __builtin_ffs((int)DA9062AA_BUCK4_SL_A_MASK) - 1,drivers/regulator/da9062-regulator.c +1
-0sizeof(unsigned int) * 8 -@@ -604,6 +621,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK1_A , .desc.vsel_mask =DA9062AA_VBUCK1_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK1_A, __builtin_ffs((int)DA9062AA_BUCK1_SL_A_MASK) - 1,drivers/regulator/da9062-regulator.c +1
-0sizeof(unsigned int) * 8 -@@ -640,6 +658,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK2_A , .desc.vsel_mask =DA9062AA_VBUCK2_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK2_A, __builtin_ffs((int)DA9062AA_BUCK2_SL_A_MASK) - 1,drivers/regulator/da9062-regulator.c +1
-0sizeof(unsigned int) * 8 -@@ -676,6 +695,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK3_A , .desc.vsel_mask =DA9062AA_VBUCK3_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK3_A, __builtin_ffs((int)DA9062AA_BUCK3_SL_A_MASK) - 1,drivers/regulator/da9062-regulator.c +1
-0sizeof(unsigned int) * 8 -@@ -712,6 +732,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg =DA9062AA_VBUCK4_A , .desc.vsel_mask =DA9062AA_VBUCK4_A_MASK , .desc.linear_min_sel =0 , + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK4_A, __builtin_ffs((int)DA9062AA_BUCK4_SL_A_MASK) - 1,sizeof(unsigned int) * 8 -
--
2.1.4
Mark Brown
maintainerApplied "regulator: da9062: add of_map_mode support for bucks" to the regulator tree
In reply to Christoph FritzThe patch
regulator: da9062: add of_map_mode support for bucks
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 844e7492ee3da1a8714bf3cc1dd54d777a5257c2 Mon Sep 17 00:00:00 2001
From: Christoph Fritz <[email protected]>
Date: Wed, 13 Nov 2019 14:40:14 +0100
Subject: [PATCH] regulator: da9062: add of_map_mode support for bucks
This patch adds of_map_mode support for bucks to set regulator modes from within regulator framework.
--- drivers/regulator/da9062-regulator.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/regulator/da9062-regulator.c +21 -0
@@ -98,6 +98,20 @@ static const unsigned int da9062_buck_b_limits[] = { 2300000, 2400000, 2500000, 2600000, 2700000, 2800000, 2900000, 3000000 }; +static unsigned int da9062_map_buck_mode (unsigned int mode) +{ +switch (mode) { +case DA9063_BUCK_MODE_SLEEP : +return REGULATOR_MODE_STANDBY ; +case DA9063_BUCK_MODE_SYNC : +return REGULATOR_MODE_FAST ; +case DA9063_BUCK_MODE_AUTO : +return REGULATOR_MODE_NORMAL ; +default : +return -EINVAL ; + } +} +static int da9062_buck_set_mode (struct regulator_dev *rdev,unsigned mode) {struct da9062_regulator *regl =rdev_get_drvdata (rdev);
@@ -360,6 +374,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK1_A, .desc.vsel_mask = DA9062AA_VBUCK1_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK1_A, __builtin_ffs((int)DA9062AA_BUCK1_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -396,6 +411,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK3_A, .desc.vsel_mask = DA9062AA_VBUCK3_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK3_A, __builtin_ffs((int)DA9062AA_BUCK3_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -432,6 +448,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK4_A, .desc.vsel_mask = DA9062AA_VBUCK4_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK4_A, __builtin_ffs((int)DA9062AA_BUCK4_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -604,6 +621,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK1_A, .desc.vsel_mask = DA9062AA_VBUCK1_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK1_A, __builtin_ffs((int)DA9062AA_BUCK1_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -640,6 +658,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK2_A, .desc.vsel_mask = DA9062AA_VBUCK2_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK2_A, __builtin_ffs((int)DA9062AA_BUCK2_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -676,6 +695,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK3_A, .desc.vsel_mask = DA9062AA_VBUCK3_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK3_A, __builtin_ffs((int)DA9062AA_BUCK3_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
@@ -712,6 +732,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.vsel_reg = DA9062AA_VBUCK4_A, .desc.vsel_mask = DA9062AA_VBUCK4_A_MASK, .desc.linear_min_sel = 0, + .desc.of_map_mode = da9062_map_buck_mode, .sleep = REG_FIELD(DA9062AA_VBUCK4_A, __builtin_ffs((int)DA9062AA_BUCK4_SL_A_MASK) - 1, sizeof(unsigned int) * 8 -
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/4 dt-bindings: mfd: da9062: describe buck modes
In reply to Christoph FritzThis patch adds DT description of da9062 buck regulator modes.
--- Documentation/devicetree/bindings/mfd/da9062.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/mfd/da9062.txt +4 -0
@@ -66,6 +66,9 @@ Sub-nodes: details of individual regulator device can be found in: Documentation/devicetree/bindings/regulator/regulator.txt + regulator-initial-mode may be specified for buck regulators using mode values + from include/dt-bindings/regulator/dlg,da9063-regulator.h. + - rtc : This node defines settings required for the Real-Time Clock associated with the DA9062. There are currently no entries in this binding, however compatible = "dlg,da9062-rtc" should be added if a node is created.
@@ -96,6 +99,7 @@ Example: regulator-max-microvolt = <1570000>; regulator-min-microamp = <500000>; regulator-max-microamp = <2000000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-boot-on; }; DA9062_LDO1: ldo1 {
Signature · 1 line
2.1.4
RE: [PATCH v2 3/4] dt-bindings: mfd: da9062: describe buck modes
Quoted 3 lines · Christoph Fritz
This patch adds DT description of da9062 buck regulator modes.
Signed-off-by Christoph Fritz <[email protected]>
Quoted 30 lines
--- Documentation/devicetree/bindings/mfd/da9062.txt | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/mfd/da9062.txt +4
-0@@ -66,6 +66,9 @@ Sub-nodes: details of individual regulator device can be found in: Documentation/devicetree/bindings/regulator/regulator.txt + regulator-initial-mode may be specified for buck regulators using mode values + from include/dt-bindings/regulator/dlg,da9063-regulator.h. + - rtc : This node defines settings required for the Real-Time Clock associated with the DA9062. There are currently no entries in this binding, however compatible = "dlg,da9062-rtc" should be added if a node is created.@@ -96,6 +99,7 @@ Example: regulator-max-microvolt = <1570000>; regulator-min-microamp = <500000>; regulator-max-microamp = <2000000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-boot-on; };
DA9062_LDO1: ldo1 {
--
2.1.4
Mark Brown
maintainerApplied "dt-bindings: mfd: da9062: describe buck modes" to the regulator tree
In reply to Christoph FritzThe patch
dt-bindings: mfd: da9062: describe buck modes
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 a4bb429811bd4a5be94873ae218062c83c476ed9 Mon Sep 17 00:00:00 2001
From: Christoph Fritz <[email protected]>
Date: Wed, 13 Nov 2019 14:40:15 +0100
Subject: [PATCH] dt-bindings: mfd: da9062: describe buck modes
This patch adds DT description of da9062 buck regulator modes.
--- Documentation/devicetree/bindings/mfd/da9062.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/mfd/da9062.txt +4 -0
@@ -66,6 +66,9 @@ Sub-nodes: details of individual regulator device can be found in: Documentation/devicetree/bindings/regulator/regulator.txt + regulator-initial-mode may be specified for buck regulators using mode values + from include/dt-bindings/regulator/dlg,da9063-regulator.h. + - rtc : This node defines settings required for the Real-Time Clock associated with the DA9062. There are currently no entries in this binding, however compatible = "dlg,da9062-rtc" should be added if a node is created.
@@ -96,6 +99,7 @@ Example: regulator-max-microvolt = <1570000>; regulator-min-microamp = <500000>; regulator-max-microamp = <2000000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-boot-on; }; DA9062_LDO1: ldo1 {
Signature · 1 line
2.20.1
PATCH v2 4/4 ARM: dts: phycore-imx6: set buck regulator modes explicitly
In reply to Christoph FritzThis patch sets initial buck regulator modes explicitly to a state this hardware needs. So a wrong initial mode set by bootloader or pmic itself does not interfere anymore.
--- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +5 -0
@@ -5,6 +5,7 @@ */ #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> / { aliases {
@@ -109,6 +110,7 @@ regulator-name = "vdd_arm"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };
@@ -116,6 +118,7 @@ regulator-name = "vdd_soc"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };
@@ -123,6 +126,7 @@ regulator-name = "vdd_ddr3"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };
@@ -130,6 +134,7 @@ regulator-name = "vdd_eth"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };
Signature · 1 line
2.1.4
RE: [PATCH v2 4/4] ARM: dts: phycore-imx6: set buck regulator modes explicitly
Quoted 5 lines · Christoph Fritz
This patch sets initial buck regulator modes explicitly to a state this hardware needs. So a wrong initial mode set by bootloader or pmic itself does not interfere anymore.
Signed-off-by Christoph Fritz <[email protected]>
Quoted 55 lines
--- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +5
-1@@ -5,6 +5,7 @@ */ #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> / { aliases {@@ -109,6 +110,7 @@ regulator-name = "vdd_arm"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -116,6 +118,7 @@ regulator-name = "vdd_soc"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -123,6 +126,7 @@ regulator-name = "vdd_ddr3"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -130,6 +134,7 @@ regulator-name = "vdd_eth"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; }; --2.1.4
Re: [PATCH v2 4/4] ARM: dts: phycore-imx6: set buck regulator modes explicitly
Hi Shawn,
any chance to get this patch queued for the upcoming kernel?
bye
-- Christoph
Quoted 66 lines · Adam Thomson
Quoted 5 lines · Christoph Fritz
This patch sets initial buck regulator modes explicitly to a state this hardware needs. So a wrong initial mode set by bootloader or pmic itself does not interfere anymore.
Signed-off-by Christoph Fritz <[email protected]>Reviewed-by Adam Thomson <[email protected]>Quoted 55 lines
--- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +5
-1@@ -5,6 +5,7 @@ */ #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> / { aliases {@@ -109,6 +110,7 @@ regulator-name = "vdd_arm"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -116,6 +118,7 @@ regulator-name = "vdd_soc"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -123,6 +126,7 @@ regulator-name = "vdd_ddr3"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -130,6 +134,7 @@ regulator-name = "vdd_eth"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; }; --2.1.4
Re: [PATCH v2 4/4] ARM: dts: phycore-imx6: set buck regulator modes explicitly
Quoted 3 lines · Christoph Fritz
Hi Shawn,
any chance to get this patch queued for the upcoming kernel?
Sorry, no. I need to wait for DA9063_BUCK_MODE_SYNC landing on 5.5-rc1, and then apply this DTS patch.
Shawn
Quoted 74 lines
bye
-- ChristophQuoted 66 lines · Adam Thomson
Quoted 5 lines · Christoph Fritz
This patch sets initial buck regulator modes explicitly to a state this hardware needs. So a wrong initial mode set by bootloader or pmic itself does not interfere anymore.
Signed-off-by Christoph Fritz <[email protected]>Reviewed-by Adam Thomson <[email protected]>Quoted 55 lines
--- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +5
-1@@ -5,6 +5,7 @@ */ #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/regulator/dlg,da9063-regulator.h> / { aliases {@@ -109,6 +110,7 @@ regulator-name = "vdd_arm"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -116,6 +118,7 @@ regulator-name = "vdd_soc"; regulator-min-microvolt = <730000>; regulator-max-microvolt = <1380000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -123,6 +126,7 @@ regulator-name = "vdd_ddr3"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; };@@ -130,6 +134,7 @@ regulator-name = "vdd_eth"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; regulator-always-on; }; --2.1.4
Re: [PATCH v2 4/4] ARM: dts: phycore-imx6: set buck regulator modes explicitly
Quoted 7 lines · Shawn Guo
Quoted 3 lines · Christoph Fritz
Hi Shawn,
any chance to get this patch queued for the upcoming kernel?
Sorry, no. I need to wait for
DA9063_BUCK_MODE_SYNClanding on 5.5-rc1, and then apply this DTS patch.
DA9063_BUCK_MODE_SYNC is now available in 5.5-rc1, could you queue this patch now?
Re: [PATCH v2 4/4] ARM: dts: phycore-imx6: set buck regulator modes explicitly
Quoted 4 lines · Christoph Fritz
Quoted 3 lines · Shawn Guo
Quoted 2 lines · Christoph Fritz
Hi Shawn,
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
any chance to get this patch queued for the upcoming kernel?
Sorry, no. I need to wait for
DA9063_BUCK_MODE_SYNClanding on 5.5-rc1, and then apply this DTS patch.
DA9063_BUCK_MODE_SYNCis now available in 5.5-rc1, could you queue this patch now?
Done. Thanks for reminding.
Shawn