* [PATCH 1/4] regulator: da9211: Move buck modes into header file
2020-07-02 3:15 [PATCH 0/4] regulator: da9211: support changing modes Anand K Mistry
@ 2020-07-02 3:15 ` Anand K Mistry
2020-07-02 3:15 ` [PATCH 2/4] dt-bindings: regulator: da9211: Document allowed modes Anand K Mistry
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Anand K Mistry @ 2020-07-02 3:15 UTC (permalink / raw)
To: linux-mediatek
Cc: devicetree, drinkcat, Anand K Mistry, Liam Girdwood, Rob Herring,
linux-kernel, Mark Brown, hsinyi, Support Opensource
This will allow device trees to make use of these constants.
Signed-off-by: Anand K Mistry <amistry@google.com>
---
drivers/regulator/da9211-regulator.c | 5 +----
.../dt-bindings/regulator/dlg,da9211-regulator.h | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 include/dt-bindings/regulator/dlg,da9211-regulator.h
diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c
index 2ea4362ffa5c..1f9b75b41346 100644
--- a/drivers/regulator/da9211-regulator.c
+++ b/drivers/regulator/da9211-regulator.c
@@ -17,6 +17,7 @@
#include <linux/gpio/consumer.h>
#include <linux/regulator/of_regulator.h>
#include <linux/regulator/da9211.h>
+#include <dt-bindings/regulator/dlg,da9211-regulator.h>
#include "da9211-regulator.h"
/* DEVICE IDs */
@@ -24,10 +25,6 @@
#define DA9213_DEVICE_ID 0x23
#define DA9215_DEVICE_ID 0x24
-#define DA9211_BUCK_MODE_SLEEP 1
-#define DA9211_BUCK_MODE_SYNC 2
-#define DA9211_BUCK_MODE_AUTO 3
-
/* DA9211 REGULATOR IDs */
#define DA9211_ID_BUCKA 0
#define DA9211_ID_BUCKB 1
diff --git a/include/dt-bindings/regulator/dlg,da9211-regulator.h b/include/dt-bindings/regulator/dlg,da9211-regulator.h
new file mode 100644
index 000000000000..cdce2d54c8ba
--- /dev/null
+++ b/include/dt-bindings/regulator/dlg,da9211-regulator.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef _DT_BINDINGS_REGULATOR_DLG_DA9211_H
+#define _DT_BINDINGS_REGULATOR_DLG_DA9211_H
+
+/*
+ * These buck mode constants may be used to specify values in device tree
+ * properties (e.g. regulator-initial-mode, regulator-allowed-modes).
+ * A description of the following modes is in the manufacturers datasheet.
+ */
+
+#define DA9211_BUCK_MODE_SLEEP 1
+#define DA9211_BUCK_MODE_SYNC 2
+#define DA9211_BUCK_MODE_AUTO 3
+
+#endif
--
2.27.0.212.ge8ba1cc988-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] dt-bindings: regulator: da9211: Document allowed modes
2020-07-02 3:15 [PATCH 0/4] regulator: da9211: support changing modes Anand K Mistry
2020-07-02 3:15 ` [PATCH 1/4] regulator: da9211: Move buck modes into header file Anand K Mistry
@ 2020-07-02 3:15 ` Anand K Mistry
2020-07-02 3:15 ` [PATCH 3/4] regulator: da9211: Implement of_map_mode Anand K Mistry
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Anand K Mistry @ 2020-07-02 3:15 UTC (permalink / raw)
To: linux-mediatek
Cc: devicetree, drinkcat, Anand K Mistry, Liam Girdwood, Rob Herring,
linux-kernel, Mark Brown, hsinyi, Support Opensource
This patch adds a description of how operating modes may be specified.
Signed-off-by: Anand K Mistry <amistry@google.com>
---
Documentation/devicetree/bindings/regulator/da9211.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/regulator/da9211.txt b/Documentation/devicetree/bindings/regulator/da9211.txt
index 27717e816e71..eb871447d508 100644
--- a/Documentation/devicetree/bindings/regulator/da9211.txt
+++ b/Documentation/devicetree/bindings/regulator/da9211.txt
@@ -15,6 +15,8 @@ Required properties:
Optional properties:
- enable-gpios: platform gpio for control of BUCKA/BUCKB.
- Any optional property defined in regulator.txt
+ - regulator-initial-mode and regulator-allowed-modes may be specified using
+ mode values from dt-bindings/regulator/dlg,da9211-regulator.h
Example 1) DA9211
pmic: da9211@68 {
@@ -30,6 +32,8 @@ Example 1) DA9211
regulator-min-microamp = <2000000>;
regulator-max-microamp = <5000000>;
enable-gpios = <&gpio 27 0>;
+ regulator-allowed-modes = <DA9211_BUCK_MODE_SYNC
+ DA9211_BUCK_MODE_AUTO>;
};
};
};
--
2.27.0.212.ge8ba1cc988-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] regulator: da9211: Implement of_map_mode
2020-07-02 3:15 [PATCH 0/4] regulator: da9211: support changing modes Anand K Mistry
2020-07-02 3:15 ` [PATCH 1/4] regulator: da9211: Move buck modes into header file Anand K Mistry
2020-07-02 3:15 ` [PATCH 2/4] dt-bindings: regulator: da9211: Document allowed modes Anand K Mistry
@ 2020-07-02 3:15 ` Anand K Mistry
2020-07-02 3:15 ` [PATCH 4/4] arm64: dts: mediatek: Update allowed regulator modes for elm boards Anand K Mistry
2020-07-02 15:47 ` [PATCH 0/4] regulator: da9211: support changing modes Mark Brown
4 siblings, 0 replies; 6+ messages in thread
From: Anand K Mistry @ 2020-07-02 3:15 UTC (permalink / raw)
To: linux-mediatek
Cc: drinkcat, Anand K Mistry, Liam Girdwood, linux-kernel,
Mark Brown, hsinyi, Support Opensource
Implementing of_map_mode is necessary to be able to specify operating
modes in the devicetree using 'regulator-allowed-modes', and to change
regulator modes.
Signed-off-by: Anand K Mistry <amistry@google.com>
---
drivers/regulator/da9211-regulator.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c
index 1f9b75b41346..297b3aa7c753 100644
--- a/drivers/regulator/da9211-regulator.c
+++ b/drivers/regulator/da9211-regulator.c
@@ -86,6 +86,20 @@ static const int da9215_current_limits[] = {
5600000, 5800000, 6000000, 6200000, 6400000, 6600000, 6800000, 7000000
};
+static unsigned int da9211_map_buck_mode(unsigned int mode)
+{
+ switch (mode) {
+ case DA9211_BUCK_MODE_SLEEP:
+ return REGULATOR_MODE_STANDBY;
+ case DA9211_BUCK_MODE_SYNC:
+ return REGULATOR_MODE_FAST;
+ case DA9211_BUCK_MODE_AUTO:
+ return REGULATOR_MODE_NORMAL;
+ default:
+ return REGULATOR_MODE_INVALID;
+ }
+}
+
static unsigned int da9211_buck_get_mode(struct regulator_dev *rdev)
{
int id = rdev_get_id(rdev);
@@ -233,6 +247,7 @@ static const struct regulator_ops da9211_buck_ops = {
.vsel_reg = DA9211_REG_VBUCKA_A + DA9211_ID_##_id * 2,\
.vsel_mask = DA9211_VBUCK_MASK,\
.owner = THIS_MODULE,\
+ .of_map_mode = da9211_map_buck_mode,\
}
static struct regulator_desc da9211_regulators[] = {
@@ -242,8 +257,14 @@ static struct regulator_desc da9211_regulators[] = {
#ifdef CONFIG_OF
static struct of_regulator_match da9211_matches[] = {
- [DA9211_ID_BUCKA] = { .name = "BUCKA" },
- [DA9211_ID_BUCKB] = { .name = "BUCKB" },
+ [DA9211_ID_BUCKA] = {
+ .name = "BUCKA",
+ .desc = &da9211_regulators[DA9211_ID_BUCKA],
+ },
+ [DA9211_ID_BUCKB] = {
+ .name = "BUCKB",
+ .desc = &da9211_regulators[DA9211_ID_BUCKB],
+ },
};
static struct da9211_pdata *da9211_parse_regulators_dt(
--
2.27.0.212.ge8ba1cc988-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] arm64: dts: mediatek: Update allowed regulator modes for elm boards
2020-07-02 3:15 [PATCH 0/4] regulator: da9211: support changing modes Anand K Mistry
` (2 preceding siblings ...)
2020-07-02 3:15 ` [PATCH 3/4] regulator: da9211: Implement of_map_mode Anand K Mistry
@ 2020-07-02 3:15 ` Anand K Mistry
2020-07-02 15:47 ` [PATCH 0/4] regulator: da9211: support changing modes Mark Brown
4 siblings, 0 replies; 6+ messages in thread
From: Anand K Mistry @ 2020-07-02 3:15 UTC (permalink / raw)
To: linux-mediatek
Cc: devicetree, drinkcat, Anand K Mistry, linux-kernel, Rob Herring,
hsinyi, Matthias Brugger, linux-arm-kernel
This sets the allowed regulator modes for elm (and derivative) boards.
According to the datasheet, the da9211 does not support SLEEP mode.
Signed-off-by: Anand K Mistry <amistry@google.com>
---
arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
index a5a12b2599a4..d4c84a856e7b 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
@@ -6,6 +6,7 @@
#include <dt-bindings/input/input.h>
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/regulator/dlg,da9211-regulator.h>
#include "mt8173.dtsi"
/ {
@@ -294,7 +295,8 @@ da9211_vcpu_reg: BUCKA {
regulator-max-microamp = <4400000>;
regulator-ramp-delay = <10000>;
regulator-always-on;
- regulator-allowed-modes = <0 1>;
+ regulator-allowed-modes = <DA9211_BUCK_MODE_SYNC
+ DA9211_BUCK_MODE_AUTO>;
};
da9211_vgpu_reg: BUCKB {
--
2.27.0.212.ge8ba1cc988-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] regulator: da9211: support changing modes
2020-07-02 3:15 [PATCH 0/4] regulator: da9211: support changing modes Anand K Mistry
` (3 preceding siblings ...)
2020-07-02 3:15 ` [PATCH 4/4] arm64: dts: mediatek: Update allowed regulator modes for elm boards Anand K Mistry
@ 2020-07-02 15:47 ` Mark Brown
4 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-07-02 15:47 UTC (permalink / raw)
To: linux-mediatek, Anand K Mistry
Cc: devicetree, drinkcat, Support Opensource, linux-kernel,
Liam Girdwood, Rob Herring, hsinyi, Matthias Brugger,
linux-arm-kernel
On Thu, 2 Jul 2020 13:15:21 +1000, Anand K Mistry wrote:
> This patchset adds support for being able to change regulator modes for
> the da9211 regulator. This is needed to allow the voltage scaling
> support in the MT8173 SoC to be used in the elm (Acer Chromebook R13)
> and hana (several Lenovo Chromebooks) devices.
>
>
> Anand K Mistry (4):
> regulator: da9211: Move buck modes into header file
> dt-bindings: regulator: da9211: Document allowed modes
> regulator: da9211: Implement of_map_mode
> arm64: dts: mediatek: Update allowed regulator modes for elm boards
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/3] regulator: da9211: Move buck modes into header file
commit: 6c8b65950b1c75b9e41b5bf314f5d7b81df91272
[2/3] regulator: da9211: Document allowed modes
commit: 650e5adae0197bb9ecaa48b98b8ada1cc6772fb0
[3/3] regulator: da9211: Implement of_map_mode
commit: 6f1f1a8039e5f7a61e932d6a9a50708c56e21033
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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 6+ messages in thread