dt-bindings: regulator: Convert regulator binding to json-schema

PATCH In review Rob Herring 2 participants 6 messages May 21, 2019 – May 23, 2019

Subsystems (2)

Device tree bindings Voltage and current regulator framework

lore

Share & tools

lore

Rob Herring

author maintainer

2019-05-21 21:20 UTC #0 lore raw

PATCH 1/3 dt-bindings: regulator: Convert regulator binding to json-schema

Convert the common regulator binding to DT schema format. Note that all the properties with standard unit suffixes have type checks already, so only a description is necessary.

As fixed-regulator has already been converted, update the references in it. Otherwise, keep regulator.txt with a reference to the schema to avoid a bunch of treewide updates. regulator.txt can be removed when all the regulator bindings are converted.

Cc Liam Girdwood <[email protected]>

Cc Mark Brown <[email protected]>

Signed-off-by Rob Herring <[email protected]>

---
 .../bindings/regulator/fixed-regulator.yaml   |   5 +-
 .../bindings/regulator/regulator.txt          | 140 +-----------
 .../bindings/regulator/regulator.yaml         | 200 ++++++++++++++++++
 3 files changed, 205 insertions(+), 140 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/regulator.yaml

Documentation/devicetree/bindings/regulator/fixed-regulator.yaml +4 -1

index d289c2f7455a..a650b457085d 100644
@@ -12,10 +12,13 @@ maintainers:
 
 description:
   Any property defined as part of the core regulator binding, defined in
-  regulator.txt, can also be used. However a fixed voltage regulator is
+  regulator.yaml, can also be used. However a fixed voltage regulator is
   expected to have the regulator-min-microvolt and regulator-max-microvolt
   to be the same.
 
+allOf:
+  - $ref: "regulator.yaml#"
+
 properties:
   compatible:
     const: regulator-fixed

Documentation/devicetree/bindings/regulator/regulator.txt +1 ~~-139~~

140 lines not on this page · raw message

Documentation/devicetree/bindings/regulator/regulator.yaml new file +200 -0

200 lines not on this page · raw message

Signature · 1 line

2.20.1

Rob Herring

author maintainer

2019-05-21 21:20 UTC #1 lore raw

PATCH 2/3 dt-bindings: regulator: Convert gpio-regulator to json-schema

Convert the gpio-regulator binding to DT schema format using json-schema.

Cc Liam Girdwood <[email protected]>

Cc Mark Brown <[email protected]>

Signed-off-by Rob Herring <[email protected]>

---
 .../bindings/regulator/gpio-regulator.txt     |  57 ---------
 .../bindings/regulator/gpio-regulator.yaml    | 118 ++++++++++++++++++
 2 files changed, 118 insertions(+), 57 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.yaml

Documentation/devicetree/bindings/regulator/gpio-regulator.txt deleted +0 ~~-57~~

deleted file mode 100644
index dd25e73b5d79..000000000000
@@ -1,57 +0,0 @@
-GPIO controlled regulators
-
-Required properties:
-- compatible		: Must be "regulator-gpio".
-- regulator-name	: Defined in regulator.txt as optional, but required
-			  here.
-- gpios			: Array of one or more GPIO pins used to select the
-			  regulator voltage/current listed in "states".
-- states		: Selection of available voltages/currents provided by
-			  this regulator and matching GPIO configurations to
-			  achieve them. If there are no states in the "states"
-			  array, use a fixed regulator instead.
-
-Optional properties:
-- enable-gpios		: GPIO used to enable/disable the regulator.
-			  Warning, the GPIO phandle flags are ignored and the
-			  GPIO polarity is controlled solely by the presence
-			  of "enable-active-high" DT property. This is due to
-			  compatibility with old DTs.
-- enable-active-high	: Polarity of "enable-gpio" GPIO is active HIGH.
-			  Default is active LOW.
-- gpios-states		: On operating systems, that don't support reading back
-			  gpio values in output mode (most notably linux), this
-			  array provides the state of GPIO pins set when
-			  requesting them from the gpio controller. Systems,
-			  that are capable of preserving state when requesting
-			  the lines, are free to ignore this property.
-			  0: LOW, 1: HIGH. Default is LOW if nothing else
-			  is specified.
-- startup-delay-us	: Startup time in microseconds.
-- regulator-type	: Specifies what is being regulated, must be either
-			  "voltage" or "current", defaults to voltage.
-
-Any property defined as part of the core regulator binding defined in
-regulator.txt can also be used.
-
-Example:
-
-	mmciv: gpio-regulator {
-		compatible = "regulator-gpio";
-
-		regulator-name = "mmci-gpio-supply";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <2600000>;
-		regulator-boot-on;
-
-		enable-gpios = <&gpio0 23 0x4>;
-		gpios = <&gpio0 24 0x4
-			 &gpio0 25 0x4>;
-		states = <1800000 0x3
-			  2200000 0x2
-			  2600000 0x1
-			  2900000 0x0>;
-
-		startup-delay-us = <100000>;
-		enable-active-high;
-	};

Documentation/devicetree/bindings/regulator/gpio-regulator.yaml new file +118 -0

118 lines not on this page · raw message

Signature · 1 line

2.20.1

Mark Brown

maintainer

2019-05-23 13:49 UTC #2 lore raw

Applied "regulator: Convert gpio-regulator to json-schema" to the regulator tree

The patch

regulator: Convert gpio-regulator to json-schema

has been applied to the regulator tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.3

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

Quoted 1 line

From 673e401effe9dfd655f2d16588248f4c043361ce Mon Sep 17 00:00:00 2001

From: Rob Herring <[email protected]>
Date: Tue, 21 May 2019 16:20:30 -0500
Subject: [PATCH] regulator: Convert gpio-regulator to json-schema

Convert the gpio-regulator binding to DT schema format using json-schema.

Signed-off-by Rob Herring <[email protected]>

Signed-off-by Mark Brown <[email protected]>

---
 .../bindings/regulator/gpio-regulator.txt     |  57 ---------
 .../bindings/regulator/gpio-regulator.yaml    | 118 ++++++++++++++++++
 2 files changed, 118 insertions(+), 57 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.yaml

Documentation/devicetree/bindings/regulator/gpio-regulator.txt deleted +0 ~~-57~~

deleted file mode 100644
index dd25e73b5d79..000000000000
@@ -1,57 +0,0 @@
-GPIO controlled regulators
-
-Required properties:
-- compatible		: Must be "regulator-gpio".
-- regulator-name	: Defined in regulator.txt as optional, but required
-			  here.
-- gpios			: Array of one or more GPIO pins used to select the
-			  regulator voltage/current listed in "states".
-- states		: Selection of available voltages/currents provided by
-			  this regulator and matching GPIO configurations to
-			  achieve them. If there are no states in the "states"
-			  array, use a fixed regulator instead.
-
-Optional properties:
-- enable-gpios		: GPIO used to enable/disable the regulator.
-			  Warning, the GPIO phandle flags are ignored and the
-			  GPIO polarity is controlled solely by the presence
-			  of "enable-active-high" DT property. This is due to
-			  compatibility with old DTs.
-- enable-active-high	: Polarity of "enable-gpio" GPIO is active HIGH.
-			  Default is active LOW.
-- gpios-states		: On operating systems, that don't support reading back
-			  gpio values in output mode (most notably linux), this
-			  array provides the state of GPIO pins set when
-			  requesting them from the gpio controller. Systems,
-			  that are capable of preserving state when requesting
-			  the lines, are free to ignore this property.
-			  0: LOW, 1: HIGH. Default is LOW if nothing else
-			  is specified.
-- startup-delay-us	: Startup time in microseconds.
-- regulator-type	: Specifies what is being regulated, must be either
-			  "voltage" or "current", defaults to voltage.
-
-Any property defined as part of the core regulator binding defined in
-regulator.txt can also be used.
-
-Example:
-
-	mmciv: gpio-regulator {
-		compatible = "regulator-gpio";
-
-		regulator-name = "mmci-gpio-supply";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <2600000>;
-		regulator-boot-on;
-
-		enable-gpios = <&gpio0 23 0x4>;
-		gpios = <&gpio0 24 0x4
-			 &gpio0 25 0x4>;
-		states = <1800000 0x3
-			  2200000 0x2
-			  2600000 0x1
-			  2900000 0x0>;
-
-		startup-delay-us = <100000>;
-		enable-active-high;
-	};

Documentation/devicetree/bindings/regulator/gpio-regulator.yaml new file +118 -0

118 lines not on this page · raw message

Signature · 1 line

2.20.1

Rob Herring

author maintainer

2019-05-21 21:20 UTC #3 lore raw

PATCH 3/3 dt-bindings: regulator: Convert max8660 binding to json-schema

In reply to Rob Herring

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

Cc Daniel Mack <[email protected]>

Cc Liam Girdwood <[email protected]>

Cc Mark Brown <[email protected]>

Signed-off-by Rob Herring <[email protected]>

---
 .../devicetree/bindings/regulator/max8660.txt | 47 -----------
 .../bindings/regulator/max8660.yaml           | 77 +++++++++++++++++++
 2 files changed, 77 insertions(+), 47 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/max8660.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/max8660.yaml

Documentation/devicetree/bindings/regulator/max8660.txt deleted +0 ~~-47~~

deleted file mode 100644
index 8ba994d8a142..000000000000
@@ -1,47 +0,0 @@
-Maxim MAX8660 voltage regulator
-
-Required properties:
-- compatible: must be one of "maxim,max8660", "maxim,max8661"
-- reg: I2C slave address, usually 0x34
-- any required generic properties defined in regulator.txt
-
-Example:
-
-	i2c_master {
-		max8660@34 {
-			compatible = "maxim,max8660";
-			reg = <0x34>;
-
-			regulators {
-				regulator@0 {
-					regulator-compatible= "V3(DCDC)";
-					regulator-min-microvolt = <725000>;
-					regulator-max-microvolt = <1800000>;
-				};
-
-				regulator@1 {
-					regulator-compatible= "V4(DCDC)";
-					regulator-min-microvolt = <725000>;
-					regulator-max-microvolt = <1800000>;
-				};
-
-				regulator@2 {
-					regulator-compatible= "V5(LDO)";
-					regulator-min-microvolt = <1700000>;
-					regulator-max-microvolt = <2000000>;
-				};
-
-				regulator@3 {
-					regulator-compatible= "V6(LDO)";
-					regulator-min-microvolt = <1800000>;
-					regulator-max-microvolt = <3300000>;
-				};
-
-				regulator@4 {
-					regulator-compatible= "V7(LDO)";
-					regulator-min-microvolt = <1800000>;
-					regulator-max-microvolt = <3300000>;
-				};
-			};
-		};
-	};

Documentation/devicetree/bindings/regulator/max8660.yaml new file +77 -0

77 lines not on this page · raw message

Signature · 1 line

2.20.1

Mark Brown

maintainer

2019-05-23 13:49 UTC #4 lore raw

Applied "regulator: Convert max8660 binding to json-schema" to the regulator tree

The patch

regulator: Convert max8660 binding to json-schema

has been applied to the regulator tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.3

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

Quoted 1 line

From 27b1b58fcfe72fd6b53a83b0dccb678e6b6faab8 Mon Sep 17 00:00:00 2001

From: Rob Herring <[email protected]>
Date: Tue, 21 May 2019 16:20:31 -0500
Subject: [PATCH] regulator: Convert max8660 binding to json-schema

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

Signed-off-by Rob Herring <[email protected]>

Signed-off-by Mark Brown <[email protected]>

---
 .../devicetree/bindings/regulator/max8660.txt | 47 -----------
 .../bindings/regulator/max8660.yaml           | 77 +++++++++++++++++++
 2 files changed, 77 insertions(+), 47 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/max8660.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/max8660.yaml

Documentation/devicetree/bindings/regulator/max8660.txt deleted +0 ~~-47~~

deleted file mode 100644
index 8ba994d8a142..000000000000
@@ -1,47 +0,0 @@
-Maxim MAX8660 voltage regulator
-
-Required properties:
-- compatible: must be one of "maxim,max8660", "maxim,max8661"
-- reg: I2C slave address, usually 0x34
-- any required generic properties defined in regulator.txt
-
-Example:
-
-	i2c_master {
-		max8660@34 {
-			compatible = "maxim,max8660";
-			reg = <0x34>;
-
-			regulators {
-				regulator@0 {
-					regulator-compatible= "V3(DCDC)";
-					regulator-min-microvolt = <725000>;
-					regulator-max-microvolt = <1800000>;
-				};
-
-				regulator@1 {
-					regulator-compatible= "V4(DCDC)";
-					regulator-min-microvolt = <725000>;
-					regulator-max-microvolt = <1800000>;
-				};
-
-				regulator@2 {
-					regulator-compatible= "V5(LDO)";
-					regulator-min-microvolt = <1700000>;
-					regulator-max-microvolt = <2000000>;
-				};
-
-				regulator@3 {
-					regulator-compatible= "V6(LDO)";
-					regulator-min-microvolt = <1800000>;
-					regulator-max-microvolt = <3300000>;
-				};
-
-				regulator@4 {
-					regulator-compatible= "V7(LDO)";
-					regulator-min-microvolt = <1800000>;
-					regulator-max-microvolt = <3300000>;
-				};
-			};
-		};
-	};

Documentation/devicetree/bindings/regulator/max8660.yaml new file +77 -0

77 lines not on this page · raw message

Signature · 1 line

2.20.1

Mark Brown

maintainer

2019-05-23 13:49 UTC #5 lore raw

Applied "regulator: Convert regulator binding to json-schema" to the regulator tree

In reply to Rob Herring

The patch

regulator: Convert regulator binding to json-schema

has been applied to the regulator tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.3

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

Quoted 1 line

From 1914a996436b09186489da73b807e1df71259f67 Mon Sep 17 00:00:00 2001

From: Rob Herring <[email protected]>
Date: Tue, 21 May 2019 16:20:29 -0500
Subject: [PATCH] regulator: Convert regulator binding to json-schema

Convert the common regulator binding to DT schema format. Note that all the properties with standard unit suffixes have type checks already, so only a description is necessary.

Signed-off-by Rob Herring <[email protected]>

Signed-off-by Mark Brown <[email protected]>

---
 .../bindings/regulator/fixed-regulator.yaml   |   5 +-
 .../bindings/regulator/regulator.txt          | 140 +-----------
 .../bindings/regulator/regulator.yaml         | 200 ++++++++++++++++++
 3 files changed, 205 insertions(+), 140 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/regulator.yaml

Documentation/devicetree/bindings/regulator/fixed-regulator.yaml +4 -1

index d289c2f7455a..a650b457085d 100644
@@ -12,10 +12,13 @@ maintainers:
 
 description:
   Any property defined as part of the core regulator binding, defined in
-  regulator.txt, can also be used. However a fixed voltage regulator is
+  regulator.yaml, can also be used. However a fixed voltage regulator is
   expected to have the regulator-min-microvolt and regulator-max-microvolt
   to be the same.
 
+allOf:
+  - $ref: "regulator.yaml#"
+
 properties:
   compatible:
     const: regulator-fixed

Documentation/devicetree/bindings/regulator/regulator.txt +1 ~~-139~~

140 lines not on this page · raw message

Documentation/devicetree/bindings/regulator/regulator.yaml new file +200 -0

200 lines not on this page · raw message

Signature · 1 line

2.20.1