linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 0/4] regulator: mp886x: two features and dt json convert
@ 2020-08-20  9:10 Jisheng Zhang
  2020-08-20  9:10 ` [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay Jisheng Zhang
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Jisheng Zhang @ 2020-08-20  9:10 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Rob Herring, Saravanan Sekar
  Cc: linux-kernel, devicetree

This is to improve the mp886x regulator driver support.
patch1 implments .set_ramp_delay
patch2 and patch3 support the switch freq setting
patch4 converts dt binding to json-schema

Since v2:
 - Use mps,switch-frequency-hz instead of mps,switch-frequency
 - Add "maxItems: 2" to "mps,fb-voltage-divider" in dt-binding
 - Add a $ref to regulator.yaml in dt-binding

Since v1:
 - put any schema conversions at the end of the series as Mark
   suggested.

Jisheng Zhang (4):
  regulator: mp886x: implement set_ramp_delay
  dt-bindings: regulator: mp886x: support mps,switch-frequency-hz
  regulator: mp886x: support setting switch freq
  dt-bindings: regulator: Convert mp886x to json-schema

 .../devicetree/bindings/regulator/mp886x.txt  |  27 -----
 .../bindings/regulator/mps,mp886x.yaml        |  61 ++++++++++
 drivers/regulator/mp886x.c                    | 109 +++++++++++++++++-
 3 files changed, 167 insertions(+), 30 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/mp886x.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp886x.yaml

-- 
2.28.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay
  2020-08-20  9:10 [PATCH v3 0/4] regulator: mp886x: two features and dt json convert Jisheng Zhang
@ 2020-08-20  9:10 ` Jisheng Zhang
  2020-08-20 21:05   ` Mark Brown
  2020-08-20  9:11 ` [PATCH v3 2/4] dt-bindings: regulator: mp886x: support mps,switch-frequency-hz Jisheng Zhang
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Jisheng Zhang @ 2020-08-20  9:10 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Rob Herring, Saravanan Sekar
  Cc: linux-kernel, devicetree

Implement the .set_ramp_delay for MP8867 and MP8869. MP8867 and MP8869
could share the implementation, the only difference is the slew_rates
array.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 drivers/regulator/mp886x.c | 67 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/mp886x.c b/drivers/regulator/mp886x.c
index d3d475f717f4..1305bf217df1 100644
--- a/drivers/regulator/mp886x.c
+++ b/drivers/regulator/mp886x.c
@@ -18,18 +18,48 @@
 #define  MP886X_V_BOOT		(1 << 7)
 #define MP886X_SYSCNTLREG1	0x01
 #define  MP886X_MODE		(1 << 0)
+#define  MP886X_SLEW_SHIFT	3
+#define  MP886X_SLEW_MASK	(0x7 << MP886X_SLEW_SHIFT)
 #define  MP886X_GO		(1 << 6)
 #define  MP886X_EN		(1 << 7)
 
+struct mp886x_cfg_info {
+	const struct regulator_ops *rops;
+	const int slew_rates[8];
+};
+
 struct mp886x_device_info {
 	struct device *dev;
 	struct regulator_desc desc;
 	struct regulator_init_data *regulator;
 	struct gpio_desc *en_gpio;
+	const struct mp886x_cfg_info *ci;
 	u32 r[2];
 	unsigned int sel;
 };
 
+static int mp886x_set_ramp(struct regulator_dev *rdev, int ramp)
+{
+	struct mp886x_device_info *di = rdev_get_drvdata(rdev);
+	const struct mp886x_cfg_info *ci = di->ci;
+	int reg = -1, i;
+
+	for (i = 0; i < ARRAY_SIZE(ci->slew_rates); i++) {
+		if (ramp <= ci->slew_rates[i])
+			reg = i;
+		else
+			break;
+	}
+
+	if (reg < 0) {
+		dev_err(di->dev, "unsupported ramp value %d\n", ramp);
+		return -EINVAL;
+	}
+
+	return regmap_update_bits(rdev->regmap, MP886X_SYSCNTLREG1,
+				  MP886X_SLEW_MASK, reg << MP886X_SLEW_SHIFT);
+}
+
 static int mp886x_set_mode(struct regulator_dev *rdev, unsigned int mode)
 {
 	switch (mode) {
@@ -117,6 +147,21 @@ static const struct regulator_ops mp8869_regulator_ops = {
 	.is_enabled = regulator_is_enabled_regmap,
 	.set_mode = mp886x_set_mode,
 	.get_mode = mp886x_get_mode,
+	.set_ramp_delay = mp886x_set_ramp,
+};
+
+static const struct mp886x_cfg_info mp8869_ci = {
+	.rops = &mp8869_regulator_ops,
+	.slew_rates = {
+		40000,
+		30000,
+		20000,
+		10000,
+		5000,
+		2500,
+		1250,
+		625,
+	},
 };
 
 static int mp8867_set_voltage_sel(struct regulator_dev *rdev, unsigned int sel)
@@ -173,6 +218,21 @@ static const struct regulator_ops mp8867_regulator_ops = {
 	.is_enabled = regulator_is_enabled_regmap,
 	.set_mode = mp886x_set_mode,
 	.get_mode = mp886x_get_mode,
+	.set_ramp_delay = mp886x_set_ramp,
+};
+
+static const struct mp886x_cfg_info mp8867_ci = {
+	.rops = &mp8867_regulator_ops,
+	.slew_rates = {
+		64000,
+		32000,
+		16000,
+		8000,
+		4000,
+		2000,
+		1000,
+		500,
+	},
 };
 
 static int mp886x_regulator_register(struct mp886x_device_info *di,
@@ -183,7 +243,7 @@ static int mp886x_regulator_register(struct mp886x_device_info *di,
 
 	rdesc->name = "mp886x-reg";
 	rdesc->supply_name = "vin";
-	rdesc->ops = of_device_get_match_data(di->dev);
+	rdesc->ops = di->ci->rops;
 	rdesc->type = REGULATOR_VOLTAGE;
 	rdesc->n_voltages = 128;
 	rdesc->enable_reg = MP886X_SYSCNTLREG1;
@@ -234,6 +294,7 @@ static int mp886x_i2c_probe(struct i2c_client *client)
 	if (IS_ERR(di->en_gpio))
 		return PTR_ERR(di->en_gpio);
 
+	di->ci = of_device_get_match_data(dev);
 	di->dev = dev;
 
 	regmap = devm_regmap_init_i2c(client, &mp886x_regmap_config);
@@ -258,11 +319,11 @@ static int mp886x_i2c_probe(struct i2c_client *client)
 static const struct of_device_id mp886x_dt_ids[] = {
 	{
 		.compatible = "mps,mp8867",
-		.data = &mp8867_regulator_ops
+		.data = &mp8867_ci
 	},
 	{
 		.compatible = "mps,mp8869",
-		.data = &mp8869_regulator_ops
+		.data = &mp8869_ci
 	},
 	{ }
 };
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 2/4] dt-bindings: regulator: mp886x: support mps,switch-frequency-hz
  2020-08-20  9:10 [PATCH v3 0/4] regulator: mp886x: two features and dt json convert Jisheng Zhang
  2020-08-20  9:10 ` [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay Jisheng Zhang
@ 2020-08-20  9:11 ` Jisheng Zhang
  2020-08-20  9:11 ` [PATCH v3 3/4] regulator: mp886x: support setting switch freq Jisheng Zhang
  2020-08-20  9:12 ` [PATCH v3 4/4] dt-bindings: regulator: Convert mp886x to json-schema Jisheng Zhang
  3 siblings, 0 replies; 8+ messages in thread
From: Jisheng Zhang @ 2020-08-20  9:11 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Rob Herring, Saravanan Sekar
  Cc: linux-kernel, devicetree

Both MP8867 and MP8869 support different switch frequency.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 Documentation/devicetree/bindings/regulator/mp886x.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/regulator/mp886x.txt b/Documentation/devicetree/bindings/regulator/mp886x.txt
index 551867829459..b05307bbb0d9 100644
--- a/Documentation/devicetree/bindings/regulator/mp886x.txt
+++ b/Documentation/devicetree/bindings/regulator/mp886x.txt
@@ -9,6 +9,10 @@ Required properties:
 - mps,fb-voltage-divider: An array of two integers containing the resistor
   values R1 and R2 of the feedback voltage divider in kilo ohms.
 
+Optional properties:
+- mps,switch-frequency-hz: The valid switch frequency in Hertz. Available values
+  are: 500000, 750000, 1000000, 1250000, 1500000
+
 Any property defined as part of the core regulator binding, defined in
 ./regulator.txt, can also be used.
 
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 3/4] regulator: mp886x: support setting switch freq
  2020-08-20  9:10 [PATCH v3 0/4] regulator: mp886x: two features and dt json convert Jisheng Zhang
  2020-08-20  9:10 ` [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay Jisheng Zhang
  2020-08-20  9:11 ` [PATCH v3 2/4] dt-bindings: regulator: mp886x: support mps,switch-frequency-hz Jisheng Zhang
@ 2020-08-20  9:11 ` Jisheng Zhang
  2020-08-20  9:12 ` [PATCH v3 4/4] dt-bindings: regulator: Convert mp886x to json-schema Jisheng Zhang
  3 siblings, 0 replies; 8+ messages in thread
From: Jisheng Zhang @ 2020-08-20  9:11 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Rob Herring, Saravanan Sekar
  Cc: linux-kernel, devicetree

Both MP8867 and MP8869 support different switch frequency.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 drivers/regulator/mp886x.c | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/drivers/regulator/mp886x.c b/drivers/regulator/mp886x.c
index 1305bf217df1..a84fd74081de 100644
--- a/drivers/regulator/mp886x.c
+++ b/drivers/regulator/mp886x.c
@@ -22,10 +22,14 @@
 #define  MP886X_SLEW_MASK	(0x7 << MP886X_SLEW_SHIFT)
 #define  MP886X_GO		(1 << 6)
 #define  MP886X_EN		(1 << 7)
+#define MP8869_SYSCNTLREG2	0x02
 
 struct mp886x_cfg_info {
 	const struct regulator_ops *rops;
 	const int slew_rates[8];
+	const int switch_freq[4];
+	const u8 fs_reg;
+	const u8 fs_shift;
 };
 
 struct mp886x_device_info {
@@ -60,6 +64,24 @@ static int mp886x_set_ramp(struct regulator_dev *rdev, int ramp)
 				  MP886X_SLEW_MASK, reg << MP886X_SLEW_SHIFT);
 }
 
+static void mp886x_set_switch_freq(struct mp886x_device_info *di,
+				   struct regmap *regmap,
+				   u32 freq)
+{
+	const struct mp886x_cfg_info *ci = di->ci;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(ci->switch_freq); i++) {
+		if (freq == ci->switch_freq[i]) {
+			regmap_update_bits(regmap, ci->fs_reg,
+				  0x3 << ci->fs_shift, i << ci->fs_shift);
+			return;
+		}
+	}
+
+	dev_err(di->dev, "invalid frequency %d\n", freq);
+}
+
 static int mp886x_set_mode(struct regulator_dev *rdev, unsigned int mode)
 {
 	switch (mode) {
@@ -162,6 +184,14 @@ static const struct mp886x_cfg_info mp8869_ci = {
 		1250,
 		625,
 	},
+	.switch_freq = {
+		500000,
+		750000,
+		1000000,
+		1250000,
+	},
+	.fs_reg = MP8869_SYSCNTLREG2,
+	.fs_shift = 4,
 };
 
 static int mp8867_set_voltage_sel(struct regulator_dev *rdev, unsigned int sel)
@@ -233,6 +263,14 @@ static const struct mp886x_cfg_info mp8867_ci = {
 		1000,
 		500,
 	},
+	.switch_freq = {
+		500000,
+		750000,
+		1000000,
+		1500000,
+	},
+	.fs_reg = MP886X_SYSCNTLREG1,
+	.fs_shift = 1,
 };
 
 static int mp886x_regulator_register(struct mp886x_device_info *di,
@@ -273,6 +311,7 @@ static int mp886x_i2c_probe(struct i2c_client *client)
 	struct mp886x_device_info *di;
 	struct regulator_config config = { };
 	struct regmap *regmap;
+	u32 freq;
 	int ret;
 
 	di = devm_kzalloc(dev, sizeof(struct mp886x_device_info), GFP_KERNEL);
@@ -310,6 +349,9 @@ static int mp886x_i2c_probe(struct i2c_client *client)
 	config.driver_data = di;
 	config.of_node = np;
 
+	if (!of_property_read_u32(np, "mps,switch-frequency-hz", &freq))
+		mp886x_set_switch_freq(di, regmap, freq);
+
 	ret = mp886x_regulator_register(di, &config);
 	if (ret < 0)
 		dev_err(dev, "Failed to register regulator!\n");
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 4/4] dt-bindings: regulator: Convert mp886x to json-schema
  2020-08-20  9:10 [PATCH v3 0/4] regulator: mp886x: two features and dt json convert Jisheng Zhang
                   ` (2 preceding siblings ...)
  2020-08-20  9:11 ` [PATCH v3 3/4] regulator: mp886x: support setting switch freq Jisheng Zhang
@ 2020-08-20  9:12 ` Jisheng Zhang
  3 siblings, 0 replies; 8+ messages in thread
From: Jisheng Zhang @ 2020-08-20  9:12 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Rob Herring, Saravanan Sekar
  Cc: linux-kernel, devicetree

Convert the mp886x binding to DT schema format using json-schema.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 .../devicetree/bindings/regulator/mp886x.txt  | 31 ----------
 .../bindings/regulator/mps,mp886x.yaml        | 61 +++++++++++++++++++
 2 files changed, 61 insertions(+), 31 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/mp886x.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp886x.yaml

diff --git a/Documentation/devicetree/bindings/regulator/mp886x.txt b/Documentation/devicetree/bindings/regulator/mp886x.txt
deleted file mode 100644
index b05307bbb0d9..000000000000
--- a/Documentation/devicetree/bindings/regulator/mp886x.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Monolithic Power Systems MP8867/MP8869 voltage regulator
-
-Required properties:
-- compatible: Must be one of the following.
-	"mps,mp8867"
-	"mps,mp8869"
-- reg: I2C slave address.
-- enable-gpios: enable gpios.
-- mps,fb-voltage-divider: An array of two integers containing the resistor
-  values R1 and R2 of the feedback voltage divider in kilo ohms.
-
-Optional properties:
-- mps,switch-frequency-hz: The valid switch frequency in Hertz. Available values
-  are: 500000, 750000, 1000000, 1250000, 1500000
-
-Any property defined as part of the core regulator binding, defined in
-./regulator.txt, can also be used.
-
-Example:
-
-	vcpu: regulator@62 {
-		compatible = "mps,mp8869";
-		regulator-name = "vcpu";
-		regulator-min-microvolt = <700000>;
-		regulator-max-microvolt = <850000>;
-		regulator-always-on;
-		regulator-boot-on;
-		enable-gpios = <&porta 1 GPIO_ACTIVE_LOW>;
-		mps,fb-voltage-divider = <80 240>;
-		reg = <0x62>;
-	};
diff --git a/Documentation/devicetree/bindings/regulator/mps,mp886x.yaml b/Documentation/devicetree/bindings/regulator/mps,mp886x.yaml
new file mode 100644
index 000000000000..ba175b30f468
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/mps,mp886x.yaml
@@ -0,0 +1,61 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/regulator/mps,mp886x.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Monolithic Power Systems MP8867/MP8869 voltage regulator
+
+maintainers:
+  - Jisheng Zhang <jszhang@kernel.org>
+
+allOf:
+  - $ref: regulator.yaml#
+
+properties:
+  compatible:
+    enum:
+      - mps,mp8867
+      - mps,mp8869
+
+  reg:
+    maxItems: 1
+
+  enable-gpios:
+    description: GPIO to enable/disable the regulator.
+    maxItems: 1
+
+  mps,fb-voltage-divider:
+    description: An array of two integers containing the resistor
+      values R1 and R2 of the feedback voltage divider in kilo ohms.
+    $ref: "/schemas/types.yaml#/definitions/uint32-array"
+    maxItems: 2
+
+  mps,switch-frequency-hz:
+    description: The valid switch frequency in Hertz.
+    enum: [500000, 750000, 1000000, 1250000, 1500000]
+
+required:
+  - compatible
+  - reg
+  - enable-gpios
+  - mps,fb-voltage-divider
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+    i2c {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        regulator@62 {
+          compatible = "mps,mp8869";
+          regulator-name = "vcpu";
+          regulator-min-microvolt = <800000>;
+          regulator-max-microvolt = <1150000>;
+          enable-gpios = <&porta 1 GPIO_ACTIVE_LOW>;
+          mps,fb-voltage-divider = <80 240>;
+          reg = <0x62>;
+        };
+    };
+
+...
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay
  2020-08-20  9:10 ` [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay Jisheng Zhang
@ 2020-08-20 21:05   ` Mark Brown
  2020-08-21  2:17     ` Jisheng Zhang
  0 siblings, 1 reply; 8+ messages in thread
From: Mark Brown @ 2020-08-20 21:05 UTC (permalink / raw)
  To: Jisheng Zhang
  Cc: Liam Girdwood, Rob Herring, Saravanan Sekar, linux-kernel, devicetree

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

On Thu, Aug 20, 2020 at 05:10:51PM +0800, Jisheng Zhang wrote:
> Implement the .set_ramp_delay for MP8867 and MP8869. MP8867 and MP8869
> could share the implementation, the only difference is the slew_rates
> array.

This doesn't apply against current code, please check and resend.

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay
  2020-08-20 21:05   ` Mark Brown
@ 2020-08-21  2:17     ` Jisheng Zhang
  2020-08-21  9:57       ` Mark Brown
  0 siblings, 1 reply; 8+ messages in thread
From: Jisheng Zhang @ 2020-08-21  2:17 UTC (permalink / raw)
  To: Mark Brown
  Cc: Liam Girdwood, Rob Herring, Saravanan Sekar, linux-kernel, devicetree

On Thu, 20 Aug 2020 22:05:13 +0100 Mark Brown wrote:

> On Thu, Aug 20, 2020 at 05:10:51PM +0800, Jisheng Zhang wrote:
> > Implement the .set_ramp_delay for MP8867 and MP8869. MP8867 and MP8869
> > could share the implementation, the only difference is the slew_rates
> > array.  
> 
> This doesn't apply against current code, please check and resend.

I found the reason, the three patches in v2 were applied to for-next tree.
Should I renew patches based on for-next? Since the "mps,switch-frequency"
binding isn't released and used, I think I can send new patches to convert
mps,switch-frequency to mps,switch-frequency-hz.

Thanks

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay
  2020-08-21  2:17     ` Jisheng Zhang
@ 2020-08-21  9:57       ` Mark Brown
  0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2020-08-21  9:57 UTC (permalink / raw)
  To: Jisheng Zhang
  Cc: Liam Girdwood, Rob Herring, Saravanan Sekar, linux-kernel, devicetree

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

On Fri, Aug 21, 2020 at 10:17:29AM +0800, Jisheng Zhang wrote:

> I found the reason, the three patches in v2 were applied to for-next tree.
> Should I renew patches based on for-next? Since the "mps,switch-frequency"
> binding isn't released and used, I think I can send new patches to convert
> mps,switch-frequency to mps,switch-frequency-hz.

Yes, please - for-next is best for anything that isn't a bug fix.

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-08-21  9:57 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-20  9:10 [PATCH v3 0/4] regulator: mp886x: two features and dt json convert Jisheng Zhang
2020-08-20  9:10 ` [PATCH v3 1/4] regulator: mp886x: implement set_ramp_delay Jisheng Zhang
2020-08-20 21:05   ` Mark Brown
2020-08-21  2:17     ` Jisheng Zhang
2020-08-21  9:57       ` Mark Brown
2020-08-20  9:11 ` [PATCH v3 2/4] dt-bindings: regulator: mp886x: support mps,switch-frequency-hz Jisheng Zhang
2020-08-20  9:11 ` [PATCH v3 3/4] regulator: mp886x: support setting switch freq Jisheng Zhang
2020-08-20  9:12 ` [PATCH v3 4/4] dt-bindings: regulator: Convert mp886x to json-schema Jisheng Zhang

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).