[PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[Kiran Gunda]

Convert the bindings from .txt to .yaml format.

Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
---
 .../devicetree/bindings/mfd/qcom,spmi-pmic.txt     |  80 --------------
 .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml    | 115 +++++++++++++++++++++
 2 files changed, 115 insertions(+), 80 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml

diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
deleted file mode 100644
index fffc8fd..0000000
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-          Qualcomm SPMI PMICs multi-function device bindings
-
-The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084
-PMICs.  These PMICs use a QPNP scheme through SPMI interface.
-QPNP is effectively a partitioning scheme for dividing the SPMI extended
-register space up into logical pieces, and set of fixed register
-locations/definitions within these regions, with some of these regions
-specifically used for interrupt handling.
-
-The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
-interfaced to the chip via the SPMI (System Power Management Interface) bus.
-Support for multiple independent functions are implemented by splitting the
-16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
-each. A function can consume one or more of these fixed-size register regions.
-
-Required properties:
-- compatible:      Should contain one of:
-                   "qcom,pm8941",
-                   "qcom,pm8841",
-                   "qcom,pma8084",
-                   "qcom,pm8019",
-                   "qcom,pm8226",
-                   "qcom,pm8110",
-                   "qcom,pma8084",
-                   "qcom,pmi8962",
-                   "qcom,pmd9635",
-                   "qcom,pm8994",
-                   "qcom,pmi8994",
-                   "qcom,pm8916",
-                   "qcom,pm8004",
-                   "qcom,pm8909",
-                   "qcom,pm8950",
-                   "qcom,pmi8950",
-                   "qcom,pm8998",
-                   "qcom,pmi8998",
-                   "qcom,pm8005",
-                   or generalized "qcom,spmi-pmic".
-- reg:             Specifies the SPMI USID slave address for this device.
-                   For more information see:
-                   Documentation/devicetree/bindings/spmi/spmi.txt
-
-Required properties for peripheral child nodes:
-- compatible:      Should contain "qcom,xxx", where "xxx" is a peripheral name.
-
-Optional properties for peripheral child nodes:
-- interrupts:      Interrupts are specified as a 4-tuple. For more information
-                   see:
-                   Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
-- interrupt-names: Corresponding interrupt name to the interrupts property
-
-Each child node of SPMI slave id represents a function of the PMIC. In the
-example below the rtc device node represents a peripheral of pm8941
-SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.
-
-Example:
-
-	spmi {
-		compatible = "qcom,spmi-pmic-arb";
-
-		pm8941@0 {
-			compatible = "qcom,pm8941", "qcom,spmi-pmic";
-			reg = <0x0 SPMI_USID>;
-
-			rtc {
-				compatible = "qcom,rtc";
-				interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-				interrupt-names = "alarm";
-			};
-		};
-
-		pm8941@1 {
-			compatible = "qcom,pm8941", "qcom,spmi-pmic";
-			reg = <0x1 SPMI_USID>;
-
-			regulator {
-				compatible = "qcom,regulator";
-				regulator-name = "8941_boost";
-			};
-		};
-	};
diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
new file mode 100644
index 0000000..affc169
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
@@ -0,0 +1,115 @@
+# SPDX-License-Identifier: GPL-2.0-only
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/bindings/mfd/qcom,spmi-pmic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm SPMI PMICs multi-function device bindings
+
+maintainers:
+  - Lee Jones <lee.jones@linaro.org>
+  - Stephen Boyd <sboyd@codeaurora.org>
+
+description: |
+  The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084
+  PMICs.  These PMICs use a QPNP scheme through SPMI interface.
+  QPNP is effectively a partitioning scheme for dividing the SPMI extended
+  register space up into logical pieces, and set of fixed register
+  locations/definitions within these regions, with some of these regions
+  specifically used for interrupt handling.
+
+  The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
+  interfaced to the chip via the SPMI (System Power Management Interface) bus.
+  Support for multiple independent functions are implemented by splitting the
+  16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
+  each. A function can consume one or more of these fixed-size register regions.
+
+properties:
+  compatible:
+    enum:
+      - qcom,pm8941
+      - qcom,pm8841
+      - qcom,pma8084
+      - qcom,pm8019
+      - qcom,pm8226
+      - qcom,pm8110
+      - qcom,pma8084
+      - qcom,pmi8962
+      - qcom,pmd9635
+      - qcom,pm8994
+      - qcom,pmi8994
+      - qcom,pm8916
+      - qcom,pm8004
+      - qcom,pm8909
+      - qcom,pm8950
+      - qcom,pmi8950
+      - qcom,pm8998
+      - qcom,pmi8998
+      - qcom,pm8005
+      - qcom,spmi-pmic
+
+  reg:
+    maxItems: 1
+    description:
+      Specifies the SPMI USID slave address for this device.
+      For more information see Documentation/devicetree/bindings/spmi/spmi.txt
+
+patternProperties:
+  "^.*@[0-9a-f]+$":
+    type: object
+    description:
+      Each child node of SPMI slave id represents a function of the PMIC. In the
+      example below the rtc device node represents a peripheral of pm8941
+      SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.
+
+    properties:
+      compatible:
+        description:
+          Compatible of the PMIC device.
+
+      interrupts:
+        maxItems: 2
+        description:
+          Interrupts are specified as a 4-tuple. For more information
+          see Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
+
+      interrupt-names:
+        description:
+          Corresponding interrupt name to the interrupts property
+
+    required:
+      - compatible
+
+required:
+  - compatible
+  - reg
+
+examples:
+  - |
+    spmi {
+        compatible = "qcom,spmi-pmic-arb";
+        #address-cells = <2>;
+        #size-cells = <0>;
+
+       pm8941@0 {
+         compatible = "qcom,pm8941";
+         reg = <0x0 0x0>;
+
+         rtc {
+           compatible = "qcom,rtc";
+           interrupts = <0x0 0x61 0x1 0x1>;
+           interrupt-names = "alarm";
+         };
+       };
+
+       pm8941@1 {
+         compatible = "qcom,pm8941";
+         reg = <0x1 0x0>;
+
+         regulator {
+           compatible = "qcom,regulator";
+           regulator-name = "8941_boost";
+         };
+       };
+    };
+...
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
 a Linux Foundation Collaborative Project

[PATCH V3 2/2] mfd: qcom-spmi-pmic: Add support for pm6150 and pm6150l

[Kiran Gunda]

Add the compatibles and PMIC ids for pm6150 and pm6150l PMICs
found on SC7180 based platforms

Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
---
 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 ++
 drivers/mfd/qcom-spmi-pmic.c                              | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
index affc169..36f0795 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
@@ -46,6 +46,8 @@ properties:
       - qcom,pm8998
       - qcom,pmi8998
       - qcom,pm8005
+      - qcom,pm6150
+      - qcom,pm6150l
       - qcom,spmi-pmic
 
   reg:
diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
index 1df1a27..5bfeec8 100644
--- a/drivers/mfd/qcom-spmi-pmic.c
+++ b/drivers/mfd/qcom-spmi-pmic.c
@@ -36,6 +36,8 @@
 #define PM8998_SUBTYPE		0x14
 #define PMI8998_SUBTYPE		0x15
 #define PM8005_SUBTYPE		0x18
+#define PM6150L_SUBTYPE		0x1F
+#define PM6150_SUBTYPE		0x28
 
 static const struct of_device_id pmic_spmi_id_table[] = {
 	{ .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
@@ -57,6 +59,8 @@ static const struct of_device_id pmic_spmi_id_table[] = {
 	{ .compatible = "qcom,pm8998",    .data = (void *)PM8998_SUBTYPE },
 	{ .compatible = "qcom,pmi8998",   .data = (void *)PMI8998_SUBTYPE },
 	{ .compatible = "qcom,pm8005",    .data = (void *)PM8005_SUBTYPE },
+	{ .compatible = "qcom,pm6150l",   .data = (void *)PM6150L_SUBTYPE },
+	{ .compatible = "qcom,pm6150",    .data = (void *)PM6150_SUBTYPE },
 	{ }
 };
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
 a Linux Foundation Collaborative Project

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[Stephen Boyd]

Quoting Kiran Gunda (2020-02-06 05:55:26)
> Convert the bindings from .txt to .yaml format.
> 
> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
> ---

Did something change? Is there a cover letter?

> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> new file mode 100644
> index 0000000..affc169
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> @@ -0,0 +1,115 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/bindings/mfd/qcom,spmi-pmic.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm SPMI PMICs multi-function device bindings
> +
> +maintainers:
> +  - Lee Jones <lee.jones@linaro.org>
> +  - Stephen Boyd <sboyd@codeaurora.org>

Please change this to sboyd@kernel.org

> +
> +description: |
> +  The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084
> +  PMICs.  These PMICs use a QPNP scheme through SPMI interface.

This first sentence will need continual updating. Please drop it.

> +  QPNP is effectively a partitioning scheme for dividing the SPMI extended
> +  register space up into logical pieces, and set of fixed register
> +  locations/definitions within these regions, with some of these regions
> +  specifically used for interrupt handling.
> +
> +  The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
> +  interfaced to the chip via the SPMI (System Power Management Interface) bus.
> +  Support for multiple independent functions are implemented by splitting the
> +  16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
> +  each. A function can consume one or more of these fixed-size register regions.
> +
> +properties:
> +  compatible:
> +    enum:
> +      - qcom,pm8941
> +      - qcom,pm8841
> +      - qcom,pma8084
> +      - qcom,pm8019
> +      - qcom,pm8226
> +      - qcom,pm8110
> +      - qcom,pma8084
> +      - qcom,pmi8962
> +      - qcom,pmd9635
> +      - qcom,pm8994
> +      - qcom,pmi8994
> +      - qcom,pm8916
> +      - qcom,pm8004
> +      - qcom,pm8909
> +      - qcom,pm8950
> +      - qcom,pmi8950
> +      - qcom,pm8998
> +      - qcom,pmi8998
> +      - qcom,pm8005
> +      - qcom,spmi-pmic

I think we want qcom,spmi-pmic to be there always. To do that we need it
to look like:

  compatible:
    items:
      enum:
        - qcom,pm8941
        ...
      enum:
        - qcom,spmi-pmic

> +
> +  reg:
> +    maxItems: 1
> +    description:
> +      Specifies the SPMI USID slave address for this device.
> +      For more information see Documentation/devicetree/bindings/spmi/spmi.txt
> +
> +patternProperties:
> +  "^.*@[0-9a-f]+$":
> +    type: object
> +    description:
> +      Each child node of SPMI slave id represents a function of the PMIC. In the
> +      example below the rtc device node represents a peripheral of pm8941
> +      SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.
> +
> +    properties:
> +      compatible:
> +        description:
> +          Compatible of the PMIC device.
> +
> +      interrupts:
> +        maxItems: 2
> +        description:
> +          Interrupts are specified as a 4-tuple. For more information
> +          see Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt

Just make this bindings/spmi/qcom,spmi-pmic-arb.txt so that  we don't
have to worry about it. Why is max items 2? Isn't it 4? Is this property
supposed to be specified at all?

> +
> +      interrupt-names:
> +        description:
> +          Corresponding interrupt name to the interrupts property

Does this need to be specified either?

> +
> +    required:
> +      - compatible
> +
> +required:
> +  - compatible
> +  - reg
> +
> +examples:
> +  - |
> +    spmi {
> +        compatible = "qcom,spmi-pmic-arb";
> +        #address-cells = <2>;
> +        #size-cells = <0>;
> +
> +       pm8941@0 {

pmic@0

> +         compatible = "qcom,pm8941";
> +         reg = <0x0 0x0>;

Why not include the header file to get the SPMI_USID macro?

> +
> +         rtc {
> +           compatible = "qcom,rtc";
> +           interrupts = <0x0 0x61 0x1 0x1>;
> +           interrupt-names = "alarm";
> +         };
> +       };
> +
> +       pm8941@1 {

pmic@1

> +         compatible = "qcom,pm8941";
> +         reg = <0x1 0x0>;
> +
> +         regulator {
> +           compatible = "qcom,regulator";
> +           regulator-name = "8941_boost";
> +         };
> +       };
> +    };
> +...
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
>  a Linux Foundation Collaborative Project

Re: [PATCH V3 2/2] mfd: qcom-spmi-pmic: Add support for pm6150 and pm6150l

[Stephen Boyd]

Quoting Kiran Gunda (2020-02-06 05:55:27)
> Add the compatibles and PMIC ids for pm6150 and pm6150l PMICs
> found on SC7180 based platforms
> 
> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
> ---
>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 ++
>  drivers/mfd/qcom-spmi-pmic.c                              | 4 ++++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> index affc169..36f0795 100644
> --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> @@ -46,6 +46,8 @@ properties:
>        - qcom,pm8998
>        - qcom,pmi8998
>        - qcom,pm8005
> +      - qcom,pm6150
> +      - qcom,pm6150l
>        - qcom,spmi-pmic

Maybe the yaml binding needs to say this is sorted in subtype id in a
comment.

	# Sorted based on subtype ID the device reports

Or we should sort this list in the binding and sort the compatible
string table in the driver with a comment that it's sorted based on
subtype id.

>  
>    reg:
> diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
> index 1df1a27..5bfeec8 100644
> --- a/drivers/mfd/qcom-spmi-pmic.c
> +++ b/drivers/mfd/qcom-spmi-pmic.c
> @@ -36,6 +36,8 @@
>  #define PM8998_SUBTYPE         0x14
>  #define PMI8998_SUBTYPE                0x15
>  #define PM8005_SUBTYPE         0x18
> +#define PM6150L_SUBTYPE                0x1F
> +#define PM6150_SUBTYPE         0x28
>  
>  static const struct of_device_id pmic_spmi_id_table[] = {
>         { .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
> @@ -57,6 +59,8 @@ static const struct of_device_id pmic_spmi_id_table[] = {
>         { .compatible = "qcom,pm8998",    .data = (void *)PM8998_SUBTYPE },
>         { .compatible = "qcom,pmi8998",   .data = (void *)PMI8998_SUBTYPE },
>         { .compatible = "qcom,pm8005",    .data = (void *)PM8005_SUBTYPE },
> +       { .compatible = "qcom,pm6150l",   .data = (void *)PM6150L_SUBTYPE },
> +       { .compatible = "qcom,pm6150",    .data = (void *)PM6150_SUBTYPE },
>         { }
>  };

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[Rob Herring]

On Thu, Feb 06, 2020 at 11:06:55AM -0800, Stephen Boyd wrote:
> Quoting Kiran Gunda (2020-02-06 05:55:26)
> > Convert the bindings from .txt to .yaml format.
> > 
> > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
> > ---
> 
> Did something change? Is there a cover letter?
> 
> > diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> > new file mode 100644
> > index 0000000..affc169
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> > @@ -0,0 +1,115 @@
> > +# SPDX-License-Identifier: GPL-2.0-only
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/bindings/mfd/qcom,spmi-pmic.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Qualcomm SPMI PMICs multi-function device bindings
> > +
> > +maintainers:
> > +  - Lee Jones <lee.jones@linaro.org>
> > +  - Stephen Boyd <sboyd@codeaurora.org>
> 
> Please change this to sboyd@kernel.org

Should be the h/w owner, not applier of changes.

> 
> > +
> > +description: |
> > +  The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084
> > +  PMICs.  These PMICs use a QPNP scheme through SPMI interface.
> 
> This first sentence will need continual updating. Please drop it.
> 
> > +  QPNP is effectively a partitioning scheme for dividing the SPMI extended
> > +  register space up into logical pieces, and set of fixed register
> > +  locations/definitions within these regions, with some of these regions
> > +  specifically used for interrupt handling.
> > +
> > +  The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
> > +  interfaced to the chip via the SPMI (System Power Management Interface) bus.
> > +  Support for multiple independent functions are implemented by splitting the
> > +  16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
> > +  each. A function can consume one or more of these fixed-size register regions.
> > +
> > +properties:
> > +  compatible:
> > +    enum:
> > +      - qcom,pm8941
> > +      - qcom,pm8841
> > +      - qcom,pma8084
> > +      - qcom,pm8019
> > +      - qcom,pm8226
> > +      - qcom,pm8110
> > +      - qcom,pma8084
> > +      - qcom,pmi8962
> > +      - qcom,pmd9635
> > +      - qcom,pm8994
> > +      - qcom,pmi8994
> > +      - qcom,pm8916
> > +      - qcom,pm8004
> > +      - qcom,pm8909
> > +      - qcom,pm8950
> > +      - qcom,pmi8950
> > +      - qcom,pm8998
> > +      - qcom,pmi8998
> > +      - qcom,pm8005
> > +      - qcom,spmi-pmic
> 
> I think we want qcom,spmi-pmic to be there always. To do that we need it
> to look like:
> 
>   compatible:
>     items:
>       enum:
>         - qcom,pm8941
>         ...
>       enum:
>         - qcom,spmi-pmic

Yes, but missing '-' before the enum's.

> 
> > +
> > +  reg:
> > +    maxItems: 1
> > +    description:
> > +      Specifies the SPMI USID slave address for this device.
> > +      For more information see Documentation/devicetree/bindings/spmi/spmi.txt
> > +
> > +patternProperties:
> > +  "^.*@[0-9a-f]+$":

You are going to need to define the specific child nodes with the 
schemas for them, but a SPMI bus schema may be useful.

> > +    type: object
> > +    description:
> > +      Each child node of SPMI slave id represents a function of the PMIC. In the
> > +      example below the rtc device node represents a peripheral of pm8941
> > +      SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.
> > +
> > +    properties:
> > +      compatible:
> > +        description:
> > +          Compatible of the PMIC device.
> > +
> > +      interrupts:
> > +        maxItems: 2
> > +        description:
> > +          Interrupts are specified as a 4-tuple. For more information
> > +          see Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
> 
> Just make this bindings/spmi/qcom,spmi-pmic-arb.txt so that  we don't
> have to worry about it. Why is max items 2? Isn't it 4? Is this property
> supposed to be specified at all?
> 
> > +
> > +      interrupt-names:
> > +        description:
> > +          Corresponding interrupt name to the interrupts property
> 
> Does this need to be specified either?
> 
> > +
> > +    required:
> > +      - compatible
> > +
> > +required:
> > +  - compatible
> > +  - reg
> > +
> > +examples:
> > +  - |
> > +    spmi {
> > +        compatible = "qcom,spmi-pmic-arb";
> > +        #address-cells = <2>;
> > +        #size-cells = <0>;
> > +
> > +       pm8941@0 {
> 
> pmic@0
> 
> > +         compatible = "qcom,pm8941";
> > +         reg = <0x0 0x0>;
> 
> Why not include the header file to get the SPMI_USID macro?
> 
> > +
> > +         rtc {
> > +           compatible = "qcom,rtc";
> > +           interrupts = <0x0 0x61 0x1 0x1>;
> > +           interrupt-names = "alarm";
> > +         };
> > +       };
> > +
> > +       pm8941@1 {
> 
> pmic@1
> 
> > +         compatible = "qcom,pm8941";
> > +         reg = <0x1 0x0>;
> > +
> > +         regulator {
> > +           compatible = "qcom,regulator";
> > +           regulator-name = "8941_boost";
> > +         };
> > +       };
> > +    };
> > +...
> > -- 
> > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> >  a Linux Foundation Collaborative Project

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[kgunda]

On 2020-02-07 00:36, Stephen Boyd wrote:
> Quoting Kiran Gunda (2020-02-06 05:55:26)
>> Convert the bindings from .txt to .yaml format.
>> 
>> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
>> ---
> 
> Did something change? Is there a cover letter?
> 
Other than converting the bindings to .yaml not much changed from the 
previous post.
I will log the per patch changes in next post.
>> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml 
>> b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> new file mode 100644
>> index 0000000..affc169
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> @@ -0,0 +1,115 @@
>> +# SPDX-License-Identifier: GPL-2.0-only
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/bindings/mfd/qcom,spmi-pmic.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Qualcomm SPMI PMICs multi-function device bindings
>> +
>> +maintainers:
>> +  - Lee Jones <lee.jones@linaro.org>
>> +  - Stephen Boyd <sboyd@codeaurora.org>
> 
> Please change this to sboyd@kernel.org
> 
Sorry for that. I will change it in next post.
>> +
>> +description: |
>> +  The Qualcomm SPMI series presently includes PM8941, PM8841 and 
>> PMA8084
>> +  PMICs.  These PMICs use a QPNP scheme through SPMI interface.
> 
> This first sentence will need continual updating. Please drop it.
> 
Sure. Will do it in next post.
>> +  QPNP is effectively a partitioning scheme for dividing the SPMI 
>> extended
>> +  register space up into logical pieces, and set of fixed register
>> +  locations/definitions within these regions, with some of these 
>> regions
>> +  specifically used for interrupt handling.
>> +
>> +  The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, 
>> and are
>> +  interfaced to the chip via the SPMI (System Power Management 
>> Interface) bus.
>> +  Support for multiple independent functions are implemented by 
>> splitting the
>> +  16-bit SPMI slave address space into 256 smaller fixed-size 
>> regions, 256 bytes
>> +  each. A function can consume one or more of these fixed-size 
>> register regions.
>> +
>> +properties:
>> +  compatible:
>> +    enum:
>> +      - qcom,pm8941
>> +      - qcom,pm8841
>> +      - qcom,pma8084
>> +      - qcom,pm8019
>> +      - qcom,pm8226
>> +      - qcom,pm8110
>> +      - qcom,pma8084
>> +      - qcom,pmi8962
>> +      - qcom,pmd9635
>> +      - qcom,pm8994
>> +      - qcom,pmi8994
>> +      - qcom,pm8916
>> +      - qcom,pm8004
>> +      - qcom,pm8909
>> +      - qcom,pm8950
>> +      - qcom,pmi8950
>> +      - qcom,pm8998
>> +      - qcom,pmi8998
>> +      - qcom,pm8005
>> +      - qcom,spmi-pmic
> 
> I think we want qcom,spmi-pmic to be there always. To do that we need 
> it
> to look like:
> 
>   compatible:
>     items:
>       enum:
>         - qcom,pm8941
>         ...
>       enum:
>         - qcom,spmi-pmic
> 
Ok.. I will do it next post.
>> +
>> +  reg:
>> +    maxItems: 1
>> +    description:
>> +      Specifies the SPMI USID slave address for this device.
>> +      For more information see 
>> Documentation/devicetree/bindings/spmi/spmi.txt
>> +
>> +patternProperties:
>> +  "^.*@[0-9a-f]+$":
>> +    type: object
>> +    description:
>> +      Each child node of SPMI slave id represents a function of the 
>> PMIC. In the
>> +      example below the rtc device node represents a peripheral of 
>> pm8941
>> +      SID = 0. The regulator device node represents a peripheral of 
>> pm8941 SID = 1.
>> +
>> +    properties:
>> +      compatible:
>> +        description:
>> +          Compatible of the PMIC device.
>> +
>> +      interrupts:
>> +        maxItems: 2
>> +        description:
>> +          Interrupts are specified as a 4-tuple. For more information
>> +          see 
>> Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
> 
> Just make this bindings/spmi/qcom,spmi-pmic-arb.txt so that  we don't
> have to worry about it.
Ok. Will do it in next post.
  Why is max items 2? Isn't it 4?
Correct. It should be 4. I will correct it.
Is this property
> supposed to be specified at all?
> 
The interrupts are used by many of the PMIC devices. I think better to 
mention it.
>> +
>> +      interrupt-names:
>> +        description:
>> +          Corresponding interrupt name to the interrupts property
> 
> Does this need to be specified either?
> 
The interrupts are used by many of the PMIC devices. I think better to 
mention it.
>> +
>> +    required:
>> +      - compatible
>> +
>> +required:
>> +  - compatible
>> +  - reg
>> +
>> +examples:
>> +  - |
>> +    spmi {
>> +        compatible = "qcom,spmi-pmic-arb";
>> +        #address-cells = <2>;
>> +        #size-cells = <0>;
>> +
>> +       pm8941@0 {
> 
> pmic@0
> 
Ok. Will address in next series.
>> +         compatible = "qcom,pm8941";
>> +         reg = <0x0 0x0>;
> 
> Why not include the header file to get the SPMI_USID macro?
> 
Ok. I will include it in next post.
>> +
>> +         rtc {
>> +           compatible = "qcom,rtc";
>> +           interrupts = <0x0 0x61 0x1 0x1>;
>> +           interrupt-names = "alarm";
>> +         };
>> +       };
>> +
>> +       pm8941@1 {
> 
> pmic@1
> 
Ok. Will address in next series.
>> +         compatible = "qcom,pm8941";
>> +         reg = <0x1 0x0>;
>> +
>> +         regulator {
>> +           compatible = "qcom,regulator";
>> +           regulator-name = "8941_boost";
>> +         };
>> +       };
>> +    };
>> +...
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora 
>> Forum,
>>  a Linux Foundation Collaborative Project

Re: [PATCH V3 2/2] mfd: qcom-spmi-pmic: Add support for pm6150 and pm6150l

[kgunda]

On 2020-02-07 00:38, Stephen Boyd wrote:
> Quoting Kiran Gunda (2020-02-06 05:55:27)
>> Add the compatibles and PMIC ids for pm6150 and pm6150l PMICs
>> found on SC7180 based platforms
>> 
>> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
>> ---
>>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 ++
>>  drivers/mfd/qcom-spmi-pmic.c                              | 4 ++++
>>  2 files changed, 6 insertions(+)
>> 
>> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml 
>> b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> index affc169..36f0795 100644
>> --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> @@ -46,6 +46,8 @@ properties:
>>        - qcom,pm8998
>>        - qcom,pmi8998
>>        - qcom,pm8005
>> +      - qcom,pm6150
>> +      - qcom,pm6150l
>>        - qcom,spmi-pmic
> 
> Maybe the yaml binding needs to say this is sorted in subtype id in a
> comment.
> 
> 	# Sorted based on subtype ID the device reports
> 
Ok.. I will add it in next post.
> Or we should sort this list in the binding and sort the compatible
> string table in the driver with a comment that it's sorted based on
> subtype id.
> 
>> 
>>    reg:
>> diff --git a/drivers/mfd/qcom-spmi-pmic.c 
>> b/drivers/mfd/qcom-spmi-pmic.c
>> index 1df1a27..5bfeec8 100644
>> --- a/drivers/mfd/qcom-spmi-pmic.c
>> +++ b/drivers/mfd/qcom-spmi-pmic.c
>> @@ -36,6 +36,8 @@
>>  #define PM8998_SUBTYPE         0x14
>>  #define PMI8998_SUBTYPE                0x15
>>  #define PM8005_SUBTYPE         0x18
>> +#define PM6150L_SUBTYPE                0x1F
>> +#define PM6150_SUBTYPE         0x28
>> 
>>  static const struct of_device_id pmic_spmi_id_table[] = {
>>         { .compatible = "qcom,spmi-pmic", .data = (void 
>> *)COMMON_SUBTYPE },
>> @@ -57,6 +59,8 @@ static const struct of_device_id 
>> pmic_spmi_id_table[] = {
>>         { .compatible = "qcom,pm8998",    .data = (void 
>> *)PM8998_SUBTYPE },
>>         { .compatible = "qcom,pmi8998",   .data = (void 
>> *)PMI8998_SUBTYPE },
>>         { .compatible = "qcom,pm8005",    .data = (void 
>> *)PM8005_SUBTYPE },
>> +       { .compatible = "qcom,pm6150l",   .data = (void 
>> *)PM6150L_SUBTYPE },
>> +       { .compatible = "qcom,pm6150",    .data = (void 
>> *)PM6150_SUBTYPE },
>>         { }
>>  };

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[kgunda]

On 2020-02-07 03:36, Rob Herring wrote:
> On Thu, Feb 06, 2020 at 11:06:55AM -0800, Stephen Boyd wrote:
>> Quoting Kiran Gunda (2020-02-06 05:55:26)
>> > Convert the bindings from .txt to .yaml format.
>> >
>> > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
>> > ---
>> 
>> Did something change? Is there a cover letter?
>> 
>> > diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> > new file mode 100644
>> > index 0000000..affc169
>> > --- /dev/null
>> > +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> > @@ -0,0 +1,115 @@
>> > +# SPDX-License-Identifier: GPL-2.0-only
>> > +%YAML 1.2
>> > +---
>> > +$id: http://devicetree.org/schemas/bindings/mfd/qcom,spmi-pmic.yaml#
>> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> > +
>> > +title: Qualcomm SPMI PMICs multi-function device bindings
>> > +
>> > +maintainers:
>> > +  - Lee Jones <lee.jones@linaro.org>
>> > +  - Stephen Boyd <sboyd@codeaurora.org>
>> 
>> Please change this to sboyd@kernel.org
> 
> Should be the h/w owner, not applier of changes.
> 
Ok.. I will remove it in next post.
>> 
>> > +
>> > +description: |
>> > +  The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084
>> > +  PMICs.  These PMICs use a QPNP scheme through SPMI interface.
>> 
>> This first sentence will need continual updating. Please drop it.
>> 
>> > +  QPNP is effectively a partitioning scheme for dividing the SPMI extended
>> > +  register space up into logical pieces, and set of fixed register
>> > +  locations/definitions within these regions, with some of these regions
>> > +  specifically used for interrupt handling.
>> > +
>> > +  The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
>> > +  interfaced to the chip via the SPMI (System Power Management Interface) bus.
>> > +  Support for multiple independent functions are implemented by splitting the
>> > +  16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
>> > +  each. A function can consume one or more of these fixed-size register regions.
>> > +
>> > +properties:
>> > +  compatible:
>> > +    enum:
>> > +      - qcom,pm8941
>> > +      - qcom,pm8841
>> > +      - qcom,pma8084
>> > +      - qcom,pm8019
>> > +      - qcom,pm8226
>> > +      - qcom,pm8110
>> > +      - qcom,pma8084
>> > +      - qcom,pmi8962
>> > +      - qcom,pmd9635
>> > +      - qcom,pm8994
>> > +      - qcom,pmi8994
>> > +      - qcom,pm8916
>> > +      - qcom,pm8004
>> > +      - qcom,pm8909
>> > +      - qcom,pm8950
>> > +      - qcom,pmi8950
>> > +      - qcom,pm8998
>> > +      - qcom,pmi8998
>> > +      - qcom,pm8005
>> > +      - qcom,spmi-pmic
>> 
>> I think we want qcom,spmi-pmic to be there always. To do that we need 
>> it
>> to look like:
>> 
>>   compatible:
>>     items:
>>       enum:
>>         - qcom,pm8941
>>         ...
>>       enum:
>>         - qcom,spmi-pmic
> 
> Yes, but missing '-' before the enum's.
> 
Will add it in next post
>> 
>> > +
>> > +  reg:
>> > +    maxItems: 1
>> > +    description:
>> > +      Specifies the SPMI USID slave address for this device.
>> > +      For more information see Documentation/devicetree/bindings/spmi/spmi.txt
>> > +
>> > +patternProperties:
>> > +  "^.*@[0-9a-f]+$":
> 
> You are going to need to define the specific child nodes with the
> schemas for them, but a SPMI bus schema may be useful.
> 
Ok.. I will add it in next post.
>> > +    type: object
>> > +    description:
>> > +      Each child node of SPMI slave id represents a function of the PMIC. In the
>> > +      example below the rtc device node represents a peripheral of pm8941
>> > +      SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.
>> > +
>> > +    properties:
>> > +      compatible:
>> > +        description:
>> > +          Compatible of the PMIC device.
>> > +
>> > +      interrupts:
>> > +        maxItems: 2
>> > +        description:
>> > +          Interrupts are specified as a 4-tuple. For more information
>> > +          see Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
>> 
>> Just make this bindings/spmi/qcom,spmi-pmic-arb.txt so that  we don't
>> have to worry about it. Why is max items 2? Isn't it 4? Is this 
>> property
>> supposed to be specified at all?
>> 
>> > +
>> > +      interrupt-names:
>> > +        description:
>> > +          Corresponding interrupt name to the interrupts property
>> 
>> Does this need to be specified either?
>> 
>> > +
>> > +    required:
>> > +      - compatible
>> > +
>> > +required:
>> > +  - compatible
>> > +  - reg
>> > +
>> > +examples:
>> > +  - |
>> > +    spmi {
>> > +        compatible = "qcom,spmi-pmic-arb";
>> > +        #address-cells = <2>;
>> > +        #size-cells = <0>;
>> > +
>> > +       pm8941@0 {
>> 
>> pmic@0
>> 
>> > +         compatible = "qcom,pm8941";
>> > +         reg = <0x0 0x0>;
>> 
>> Why not include the header file to get the SPMI_USID macro?
>> 
>> > +
>> > +         rtc {
>> > +           compatible = "qcom,rtc";
>> > +           interrupts = <0x0 0x61 0x1 0x1>;
>> > +           interrupt-names = "alarm";
>> > +         };
>> > +       };
>> > +
>> > +       pm8941@1 {
>> 
>> pmic@1
>> 
>> > +         compatible = "qcom,pm8941";
>> > +         reg = <0x1 0x0>;
>> > +
>> > +         regulator {
>> > +           compatible = "qcom,regulator";
>> > +           regulator-name = "8941_boost";
>> > +         };
>> > +       };
>> > +    };
>> > +...
>> > --
>> > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
>> >  a Linux Foundation Collaborative Project

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[Stephen Boyd]

Quoting kgunda@codeaurora.org (2020-02-06 21:57:49)
> On 2020-02-07 00:36, Stephen Boyd wrote:
> > Quoting Kiran Gunda (2020-02-06 05:55:26)
> >> Convert the bindings from .txt to .yaml format.
> >> 
> >> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
> >> ---
> > 
> > Did something change? Is there a cover letter?
> > 
> Other than converting the bindings to .yaml not much changed from the 
> previous post.
> I will log the per patch changes in next post.

What happened to this series? It never got resent.

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[kgunda]

On 2020-10-03 03:15, Stephen Boyd wrote:
> Quoting kgunda@codeaurora.org (2020-02-06 21:57:49)
>> On 2020-02-07 00:36, Stephen Boyd wrote:
>> > Quoting Kiran Gunda (2020-02-06 05:55:26)
>> >> Convert the bindings from .txt to .yaml format.
>> >>
>> >> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
>> >> ---
>> >
>> > Did something change? Is there a cover letter?
>> >
>> Other than converting the bindings to .yaml not much changed from the
>> previous post.
>> I will log the per patch changes in next post.
> 
> What happened to this series? It never got resent.
Couldn't get the chance to work on it. Will work on it and post the next 
patch in couple weeks.

Re: [PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[Rob Herring]

On Thu, 17 Dec 2020 17:08:42 +0530, Kiran Gunda wrote:
> Convert the bindings from .txt to .yaml format.
> 
> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
> ---
>  .../devicetree/bindings/mfd/qcom,spmi-pmic.txt     |  80 -------------
>  .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml    | 127 +++++++++++++++++++++
>  2 files changed, 127 insertions(+), 80 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
>  create mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> 

My bot found errors running 'make dt_binding_check' on your patch:

yamllint warnings/errors:
./Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml:39:1: [error] syntax error: found character '\t' that cannot start any token (syntax)

dtschema/dtc warnings/errors:
make[1]: *** Deleting file 'Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.example.dts'
Traceback (most recent call last):
  File "/usr/local/bin/dt-extract-example", line 45, in <module>
    binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
  File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py", line 343, in load
    return constructor.get_single_data()
  File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py", line 111, in get_single_data
    node = self.composer.get_single_node()
  File "_ruamel_yaml.pyx", line 706, in _ruamel_yaml.CParser.get_single_node
  File "_ruamel_yaml.pyx", line 724, in _ruamel_yaml.CParser._compose_document
  File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
  File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
  File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
  File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
  File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
  File "_ruamel_yaml.pyx", line 773, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 850, in _ruamel_yaml.CParser._compose_sequence_node
  File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
  File "_ruamel_yaml.pyx", line 731, in _ruamel_yaml.CParser._compose_node
  File "_ruamel_yaml.pyx", line 904, in _ruamel_yaml.CParser._parse_next_event
ruamel.yaml.scanner.ScannerError: while scanning for the next token
found character that cannot start any token
  in "<unicode string>", line 39, column 1
make[1]: *** [Documentation/devicetree/bindings/Makefile:20: Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.example.dts] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: *** [Documentation/devicetree/bindings/Makefile:59: Documentation/devicetree/bindings/processed-schema-examples.json] Error 123
make: *** [Makefile:1364: dt_binding_check] Error 2

See https://patchwork.ozlabs.org/patch/1417646

This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.

If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:

pip3 install dtschema --upgrade

Please check and re-submit.

[PATCH V3 1/2] mfd: qcom-spmi-pmic: Convert bindings to .yaml format

[Kiran Gunda]

Convert the bindings from .txt to .yaml format.

Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
---
 .../devicetree/bindings/mfd/qcom,spmi-pmic.txt     |  80 -------------
 .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml    | 127 +++++++++++++++++++++
 2 files changed, 127 insertions(+), 80 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml

diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
deleted file mode 100644
index 79367a4..0000000
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-          Qualcomm SPMI PMICs multi-function device bindings
-
-The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084
-PMICs.  These PMICs use a QPNP scheme through SPMI interface.
-QPNP is effectively a partitioning scheme for dividing the SPMI extended
-register space up into logical pieces, and set of fixed register
-locations/definitions within these regions, with some of these regions
-specifically used for interrupt handling.
-
-The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
-interfaced to the chip via the SPMI (System Power Management Interface) bus.
-Support for multiple independent functions are implemented by splitting the
-16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
-each. A function can consume one or more of these fixed-size register regions.
-
-Required properties:
-- compatible:      Should contain one of:
-                   "qcom,pm8941",
-                   "qcom,pm8841",
-                   "qcom,pma8084",
-                   "qcom,pm8019",
-                   "qcom,pm8226",
-                   "qcom,pm8110",
-                   "qcom,pma8084",
-                   "qcom,pmi8962",
-                   "qcom,pmd9635",
-                   "qcom,pm8994",
-                   "qcom,pmi8994",
-                   "qcom,pm8916",
-                   "qcom,pm8004",
-                   "qcom,pm8909",
-                   "qcom,pm8950",
-                   "qcom,pmi8950",
-                   "qcom,pm8998",
-                   "qcom,pmi8998",
-                   "qcom,pm8005",
-                   or generalized "qcom,spmi-pmic".
-- reg:             Specifies the SPMI USID slave address for this device.
-                   For more information see:
-                   Documentation/devicetree/bindings/spmi/spmi.yaml
-
-Required properties for peripheral child nodes:
-- compatible:      Should contain "qcom,xxx", where "xxx" is a peripheral name.
-
-Optional properties for peripheral child nodes:
-- interrupts:      Interrupts are specified as a 4-tuple. For more information
-                   see:
-                   Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
-- interrupt-names: Corresponding interrupt name to the interrupts property
-
-Each child node of SPMI slave id represents a function of the PMIC. In the
-example below the rtc device node represents a peripheral of pm8941
-SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.
-
-Example:
-
-	spmi {
-		compatible = "qcom,spmi-pmic-arb";
-
-		pm8941@0 {
-			compatible = "qcom,pm8941", "qcom,spmi-pmic";
-			reg = <0x0 SPMI_USID>;
-
-			rtc {
-				compatible = "qcom,rtc";
-				interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-				interrupt-names = "alarm";
-			};
-		};
-
-		pm8941@1 {
-			compatible = "qcom,pm8941", "qcom,spmi-pmic";
-			reg = <0x1 SPMI_USID>;
-
-			regulator {
-				compatible = "qcom,regulator";
-				regulator-name = "8941_boost";
-			};
-		};
-	};
diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
new file mode 100644
index 0000000..0b3e440
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
@@ -0,0 +1,127 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/qcom,spmi-pmic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm SPMI PMICs multi-function device bindings
+
+maintainers:
+  - Stephen Boyd <sboyd@kernel.org>
+
+description: |
+  The Qualcomm SPMI PMICs use a QPNP scheme through SPMI interface.
+  QPNP is effectively a partitioning scheme for dividing the SPMI extended
+  register space up into logical pieces, and set of fixed register
+  locations/definitions within these regions, with some of these regions
+  specifically used for interrupt handling.
+
+  The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are
+  interfaced to the chip via the SPMI (System Power Management Interface) bus.
+  Support for multiple independent functions are implemented by splitting the
+  16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes
+  each. A function can consume one or more of these fixed-size register regions.
+
+properties:
+  spmi_bus:
+    type: object
+    description: SPMI bus node
+
+patternProperties:
+  "^pmic@[0-9]$":
+    description: Child PMIC nodes
+    type: object
+
+    properties:
+      compatible:
+        items:
+          - enum:
+	      # Sorted based on subtype ID the device reports
+              - qcom,pm8941
+              - qcom,pm8841
+              - qcom,pma8084
+              - qcom,pm8019
+              - qcom,pm8226
+              - qcom,pm8110
+              - qcom,pma8084
+              - qcom,pmi8962
+              - qcom,pmd9635
+              - qcom,pm8994
+              - qcom,pmi8994
+              - qcom,pm8916
+              - qcom,pm8004
+              - qcom,pm8909
+              - qcom,pm8950
+              - qcom,pmi8950
+              - qcom,pm8998
+              - qcom,pmi8998
+              - qcom,pm8005
+	      - qcom,pm660l
+	      - qcom,pm660
+
+          - enum:
+              - qcom,spmi-pmic
+
+      reg:
+        maxItems: 1
+        description:
+          Specifies the SPMI USID slave address for this device.
+          For more information see bindings/spmi/spmi.txt
+
+    patternProperties:
+      "@[0-9a-f]$":
+        description:
+          Each child node of SPMI slave id represents a function of the PMIC.
+          In the example below the rtc device node represents a peripheral of
+          pm8941 SID = 0. The regulator device node represents a peripheral of
+          pm8941 SID = 1.
+        type: object
+
+        properties:
+          interrupts:
+            maxItems: 4
+            description:
+              Interrupts are specified as a 4-tuple. For more information
+              see bindings/spmi/qcom,spmi-pmic-arb.txt
+
+          interrupt-names:
+            description:
+              Corresponding interrupt name to the interrupts property
+
+    required:
+      - compatible
+      - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/spmi/spmi.h>
+
+    spmi_bus {
+        compatible = "qcom,spmi-pmic-arb";
+        #address-cells = <2>;
+        #size-cells = <0>;
+
+        pmic@0 {
+         compatible = "qcom,pm8941";
+         reg = <0x0 SPMI_USID>;
+
+         rtc {
+           compatible = "qcom,rtc";
+           interrupts = <0x0 0x61 0x1 0x1>;
+           interrupt-names = "alarm";
+          };
+        };
+
+        pmic@1 {
+         compatible = "qcom,pm8941";
+         reg = <0x1 SPMI_USID>;
+
+         regulator {
+           compatible = "qcom,regulator";
+           regulator-name = "8941_boost";
+           };
+          };
+        };
+...
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
 a Linux Foundation Collaborative Project