diff mbox series

dt-bindings: power: avs: qcom,cpr: Convert to DT schema

Message ID 20211221133937.173618-1-y.oudjana@protonmail.com (mailing list archive)
State Handled Elsewhere, archived
Headers show
Series dt-bindings: power: avs: qcom,cpr: Convert to DT schema | expand

Commit Message

Yassine Oudjana Dec. 21, 2021, 1:40 p.m. UTC
Convert qcom,cpr.txt to DT schema format.

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
---
 .../bindings/power/avs/qcom,cpr.txt           | 130 --------------
 .../bindings/power/avs/qcom,cpr.yaml          | 161 ++++++++++++++++++
 MAINTAINERS                                   |   2 +-
 3 files changed, 162 insertions(+), 131 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
 create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml

Comments

Rob Herring (Arm) Dec. 21, 2021, 10:45 p.m. UTC | #1
On Tue, 21 Dec 2021 13:40:05 +0000, Yassine Oudjana wrote:
> Convert qcom,cpr.txt to DT schema format.
> 
> Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
> ---
>  .../bindings/power/avs/qcom,cpr.txt           | 130 --------------
>  .../bindings/power/avs/qcom,cpr.yaml          | 161 ++++++++++++++++++
>  MAINTAINERS                                   |   2 +-
>  3 files changed, 162 insertions(+), 131 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
>  create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> 

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/power/avs/qcom,cpr.example.dt.yaml:0:0: /example-0/cpr-opp-table: failed to match any schema with compatible: ['operating-points-v2-qcom-level']

doc reference errors (make refcheckdocs):

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

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.
Rob Herring (Arm) Dec. 21, 2021, 11:15 p.m. UTC | #2
On Tue, Dec 21, 2021 at 01:40:05PM +0000, Yassine Oudjana wrote:
> Convert qcom,cpr.txt to DT schema format.
> 
> Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
> ---
>  .../bindings/power/avs/qcom,cpr.txt           | 130 --------------
>  .../bindings/power/avs/qcom,cpr.yaml          | 161 ++++++++++++++++++
>  MAINTAINERS                                   |   2 +-
>  3 files changed, 162 insertions(+), 131 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
>  create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml


> diff --git a/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> new file mode 100644
> index 000000000000..852eb36eea93
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> @@ -0,0 +1,161 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/power/avs/qcom,cpr.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm Core Power Reduction (CPR) bindings
> +
> +maintainers:
> +  - Niklas Cassel <nks@flawful.org>
> +
> +description: |
> +  CPR (Core Power Reduction) is a technology to reduce core power on a CPU
> +  or other device. Each OPP of a device corresponds to a "corner" that has
> +  a range of valid voltages for a particular frequency. While the device is
> +  running at a particular frequency, CPR monitors dynamic factors such as
> +  temperature, etc. and suggests adjustments to the voltage to save power
> +  and meet silicon characteristic requirements.
> +
> +properties:
> +  compatible:
> +    allOf:

Don't need allOf with only 1 entry.

> +      - items:
> +          - enum:
> +              - qcom,qcs404-cpr
> +          - const: qcom,cpr
> +
> +  reg:
> +    description: Base address and size of the RBCPR register region.
> +    maxItems: 1
> +
> +  interrupts:
> +    maxItems: 1
> +
> +  clocks:
> +    items:
> +      - description: Reference clock.
> +
> +  clock-names:
> +    items:
> +      - const: ref
> +
> +  vdd-apc-supply:
> +    description: APC regulator supply.
> +
> +  '#power-domain-cells':
> +    const: 0
> +
> +  operating-points-v2:
> +    description: |
> +      A phandle to the OPP table containing the performance states
> +      supported by the CPR power domain.
> +
> +  acc-syscon:
> +    description: A phandle to the syscon used for writing ACC settings.
> +
> +  nvmem-cells:
> +    items:
> +      - description: Corner 1 quotient offset
> +      - description: Corner 2 quotient offset
> +      - description: Corner 3 quotient offset
> +      - description: Corner 1 initial voltage
> +      - description: Corner 2 initial voltage
> +      - description: Corner 3 initial voltage
> +      - description: Corner 1 quotient
> +      - description: Corner 2 quotient
> +      - description: Corner 3 quotient
> +      - description: Corner 1 ring oscillator
> +      - description: Corner 2 ring oscillator
> +      - description: Corner 3 ring oscillator
> +      - description: Fuse revision
> +
> +  nvmem-cell-names:
> +    items:
> +      - const: cpr_quotient_offset1
> +      - const: cpr_quotient_offset2
> +      - const: cpr_quotient_offset3
> +      - const: cpr_init_voltage1
> +      - const: cpr_init_voltage2
> +      - const: cpr_init_voltage3
> +      - const: cpr_quotient1
> +      - const: cpr_quotient2
> +      - const: cpr_quotient3
> +      - const: cpr_ring_osc1
> +      - const: cpr_ring_osc2
> +      - const: cpr_ring_osc3
> +      - const: cpr_fuse_revision
> +
> +required:
> +  - compatible
> +  - reg
> +  - interrupts
> +  - clocks
> +  - clock-names
> +  - vdd-apc-supply
> +  - '#power-domain-cells'
> +  - operating-points-v2
> +  - nvmem-cells
> +  - nvmem-cell-names
> +
> +additionalProperties: false
> +
> +examples:
> +  - |
> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> +    cpr_opp_table: cpr-opp-table {
> +        compatible = "operating-points-v2-qcom-level";
> +
> +        cpr_opp1: opp1 {
> +            opp-level = <1>;
> +            qcom,opp-fuse-level = <1>;
> +        };
> +        cpr_opp2: opp2 {
> +            opp-level = <2>;
> +            qcom,opp-fuse-level = <2>;
> +        };
> +        cpr_opp3: opp3 {
> +            opp-level = <3>;
> +            qcom,opp-fuse-level = <3>;
> +        };
> +    };
> +
> +    power-controller@b018000 {
> +        compatible = "qcom,qcs404-cpr", "qcom,cpr";
> +        reg = <0x0b018000 0x1000>;
> +        interrupts = <0 15 IRQ_TYPE_EDGE_RISING>;
> +        clocks = <&xo_board>;
> +        clock-names = "ref";
> +        vdd-apc-supply = <&pms405_s3>;
> +        #power-domain-cells = <0>;
> +        operating-points-v2 = <&cpr_opp_table>;
> +        acc-syscon = <&tcsr>;
> +
> +        nvmem-cells = <&cpr_efuse_quot_offset1>,
> +            <&cpr_efuse_quot_offset2>,
> +            <&cpr_efuse_quot_offset3>,
> +            <&cpr_efuse_init_voltage1>,
> +            <&cpr_efuse_init_voltage2>,
> +            <&cpr_efuse_init_voltage3>,
> +            <&cpr_efuse_quot1>,
> +            <&cpr_efuse_quot2>,
> +            <&cpr_efuse_quot3>,
> +            <&cpr_efuse_ring1>,
> +            <&cpr_efuse_ring2>,
> +            <&cpr_efuse_ring3>,
> +            <&cpr_efuse_revision>;
> +        nvmem-cell-names = "cpr_quotient_offset1",
> +            "cpr_quotient_offset2",
> +            "cpr_quotient_offset3",
> +            "cpr_init_voltage1",
> +            "cpr_init_voltage2",
> +            "cpr_init_voltage3",
> +            "cpr_quotient1",
> +            "cpr_quotient2",
> +            "cpr_quotient3",
> +            "cpr_ring_osc1",
> +            "cpr_ring_osc2",
> +            "cpr_ring_osc3",
> +            "cpr_fuse_revision";
> +    };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a7d86182fa6b..9ebbccb0494e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15746,7 +15746,7 @@ M:	Niklas Cassel <nks@flawful.org>
>  L:	linux-pm@vger.kernel.org
>  L:	linux-arm-msm@vger.kernel.org
>  S:	Maintained
> -F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
> +F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
>  F:	drivers/soc/qcom/cpr.c
>  
>  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
> -- 
> 2.34.1
> 
> 
>
Yassine Oudjana Jan. 4, 2022, 4:14 a.m. UTC | #3
On Tue, 21 Dec 2021 19:15:25 -0400, Rob Herring <robh@kernel.org> wrote:
> On Tue, Dec 21, 2021 at 01:40:05PM +0000, Yassine Oudjana wrote:
> > Convert qcom,cpr.txt to DT schema format.
> > 
> > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
> > ---
> >  .../bindings/power/avs/qcom,cpr.txt           | 130 --------------
> >  .../bindings/power/avs/qcom,cpr.yaml          | 161 ++++++++++++++++++
> >  MAINTAINERS                                   |   2 +-
> >  3 files changed, 162 insertions(+), 131 deletions(-)
> >  delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
> >  create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> 
> 
> > diff --git a/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> > new file mode 100644
> > index 000000000000..852eb36eea93
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> > @@ -0,0 +1,161 @@
> > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/power/avs/qcom,cpr.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Qualcomm Core Power Reduction (CPR) bindings
> > +
> > +maintainers:
> > +  - Niklas Cassel <nks@flawful.org>
> > +
> > +description: |
> > +  CPR (Core Power Reduction) is a technology to reduce core power on a CPU
> > +  or other device. Each OPP of a device corresponds to a "corner" that has
> > +  a range of valid voltages for a particular frequency. While the device is
> > +  running at a particular frequency, CPR monitors dynamic factors such as
> > +  temperature, etc. and suggests adjustments to the voltage to save power
> > +  and meet silicon characteristic requirements.
> > +
> > +properties:
> > +  compatible:
> > +    allOf:
> 
> Don't need allOf with only 1 entry.

I get this from dt_binding_check without it:

Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml: properties:compatible: [{'items': [{'enum': ['qcom,qcs404-cpr']}, {'const': 'qcom,cpr'}]}] is not of type 'object', 'boolean'

> 
> > +      - items:
> > +          - enum:
> > +              - qcom,qcs404-cpr
> > +          - const: qcom,cpr
> > +
> > +  reg:
> > +    description: Base address and size of the RBCPR register region.
> > +    maxItems: 1
> > +
> > +  interrupts:
> > +    maxItems: 1
> > +
> > +  clocks:
> > +    items:
> > +      - description: Reference clock.
> > +
> > +  clock-names:
> > +    items:
> > +      - const: ref
> > +
> > +  vdd-apc-supply:
> > +    description: APC regulator supply.
> > +
> > +  '#power-domain-cells':
> > +    const: 0
> > +
> > +  operating-points-v2:
> > +    description: |
> > +      A phandle to the OPP table containing the performance states
> > +      supported by the CPR power domain.
> > +
> > +  acc-syscon:
> > +    description: A phandle to the syscon used for writing ACC settings.
> > +
> > +  nvmem-cells:
> > +    items:
> > +      - description: Corner 1 quotient offset
> > +      - description: Corner 2 quotient offset
> > +      - description: Corner 3 quotient offset
> > +      - description: Corner 1 initial voltage
> > +      - description: Corner 2 initial voltage
> > +      - description: Corner 3 initial voltage
> > +      - description: Corner 1 quotient
> > +      - description: Corner 2 quotient
> > +      - description: Corner 3 quotient
> > +      - description: Corner 1 ring oscillator
> > +      - description: Corner 2 ring oscillator
> > +      - description: Corner 3 ring oscillator
> > +      - description: Fuse revision
> > +
> > +  nvmem-cell-names:
> > +    items:
> > +      - const: cpr_quotient_offset1
> > +      - const: cpr_quotient_offset2
> > +      - const: cpr_quotient_offset3
> > +      - const: cpr_init_voltage1
> > +      - const: cpr_init_voltage2
> > +      - const: cpr_init_voltage3
> > +      - const: cpr_quotient1
> > +      - const: cpr_quotient2
> > +      - const: cpr_quotient3
> > +      - const: cpr_ring_osc1
> > +      - const: cpr_ring_osc2
> > +      - const: cpr_ring_osc3
> > +      - const: cpr_fuse_revision
> > +
> > +required:
> > +  - compatible
> > +  - reg
> > +  - interrupts
> > +  - clocks
> > +  - clock-names
> > +  - vdd-apc-supply
> > +  - '#power-domain-cells'
> > +  - operating-points-v2
> > +  - nvmem-cells
> > +  - nvmem-cell-names
> > +
> > +additionalProperties: false
> > +
> > +examples:
> > +  - |
> > +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> > +
> > +    cpr_opp_table: cpr-opp-table {
> > +        compatible = "operating-points-v2-qcom-level";
> > +
> > +        cpr_opp1: opp1 {
> > +            opp-level = <1>;
> > +            qcom,opp-fuse-level = <1>;
> > +        };
> > +        cpr_opp2: opp2 {
> > +            opp-level = <2>;
> > +            qcom,opp-fuse-level = <2>;
> > +        };
> > +        cpr_opp3: opp3 {
> > +            opp-level = <3>;
> > +            qcom,opp-fuse-level = <3>;
> > +        };
> > +    };
> > +
> > +    power-controller@b018000 {
> > +        compatible = "qcom,qcs404-cpr", "qcom,cpr";
> > +        reg = <0x0b018000 0x1000>;
> > +        interrupts = <0 15 IRQ_TYPE_EDGE_RISING>;
> > +        clocks = <&xo_board>;
> > +        clock-names = "ref";
> > +        vdd-apc-supply = <&pms405_s3>;
> > +        #power-domain-cells = <0>;
> > +        operating-points-v2 = <&cpr_opp_table>;
> > +        acc-syscon = <&tcsr>;
> > +
> > +        nvmem-cells = <&cpr_efuse_quot_offset1>,
> > +            <&cpr_efuse_quot_offset2>,
> > +            <&cpr_efuse_quot_offset3>,
> > +            <&cpr_efuse_init_voltage1>,
> > +            <&cpr_efuse_init_voltage2>,
> > +            <&cpr_efuse_init_voltage3>,
> > +            <&cpr_efuse_quot1>,
> > +            <&cpr_efuse_quot2>,
> > +            <&cpr_efuse_quot3>,
> > +            <&cpr_efuse_ring1>,
> > +            <&cpr_efuse_ring2>,
> > +            <&cpr_efuse_ring3>,
> > +            <&cpr_efuse_revision>;
> > +        nvmem-cell-names = "cpr_quotient_offset1",
> > +            "cpr_quotient_offset2",
> > +            "cpr_quotient_offset3",
> > +            "cpr_init_voltage1",
> > +            "cpr_init_voltage2",
> > +            "cpr_init_voltage3",
> > +            "cpr_quotient1",
> > +            "cpr_quotient2",
> > +            "cpr_quotient3",
> > +            "cpr_ring_osc1",
> > +            "cpr_ring_osc2",
> > +            "cpr_ring_osc3",
> > +            "cpr_fuse_revision";
> > +    };
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index a7d86182fa6b..9ebbccb0494e 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -15746,7 +15746,7 @@ M:	Niklas Cassel <nks@flawful.org>
> >  L:	linux-pm@vger.kernel.org
> >  L:	linux-arm-msm@vger.kernel.org
> >  S:	Maintained
> > -F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
> > +F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> >  F:	drivers/soc/qcom/cpr.c
> >  
> >  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
> > -- 
> > 2.34.1
> > 
> > 
> > 
>
Rob Herring (Arm) Jan. 4, 2022, 10:03 p.m. UTC | #4
On Mon, Jan 3, 2022 at 10:14 PM Yassine Oudjana
<y.oudjana@protonmail.com> wrote:
>
> On Tue, 21 Dec 2021 19:15:25 -0400, Rob Herring <robh@kernel.org> wrote:
> > On Tue, Dec 21, 2021 at 01:40:05PM +0000, Yassine Oudjana wrote:
> > > Convert qcom,cpr.txt to DT schema format.
> > >
> > > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
> > > ---
> > >  .../bindings/power/avs/qcom,cpr.txt           | 130 --------------
> > >  .../bindings/power/avs/qcom,cpr.yaml          | 161 ++++++++++++++++++
> > >  MAINTAINERS                                   |   2 +-
> > >  3 files changed, 162 insertions(+), 131 deletions(-)
> > >  delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
> > >  create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> >
> >
> > > diff --git a/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> > > new file mode 100644
> > > index 000000000000..852eb36eea93
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
> > > @@ -0,0 +1,161 @@
> > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> > > +%YAML 1.2
> > > +---
> > > +$id: http://devicetree.org/schemas/power/avs/qcom,cpr.yaml#
> > > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > > +
> > > +title: Qualcomm Core Power Reduction (CPR) bindings
> > > +
> > > +maintainers:
> > > +  - Niklas Cassel <nks@flawful.org>
> > > +
> > > +description: |
> > > +  CPR (Core Power Reduction) is a technology to reduce core power on a CPU
> > > +  or other device. Each OPP of a device corresponds to a "corner" that has
> > > +  a range of valid voltages for a particular frequency. While the device is
> > > +  running at a particular frequency, CPR monitors dynamic factors such as
> > > +  temperature, etc. and suggests adjustments to the voltage to save power
> > > +  and meet silicon characteristic requirements.
> > > +
> > > +properties:
> > > +  compatible:
> > > +    allOf:
> >
> > Don't need allOf with only 1 entry.
>
> I get this from dt_binding_check without it:
>
> Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml: properties:compatible: [{'items': [{'enum': ['qcom,qcs404-cpr']}, {'const': 'qcom,cpr'}]}] is not of type 'object', 'boolean'

Because you made 'compatible' a list rather than a dict/object.
'allOf' is a list of subschemas though.

Rob
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt b/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
deleted file mode 100644
index ab0d5ebbad4e..000000000000
--- a/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
+++ /dev/null
@@ -1,130 +0,0 @@ 
-QCOM CPR (Core Power Reduction)
-
-CPR (Core Power Reduction) is a technology to reduce core power on a CPU
-or other device. Each OPP of a device corresponds to a "corner" that has
-a range of valid voltages for a particular frequency. While the device is
-running at a particular frequency, CPR monitors dynamic factors such as
-temperature, etc. and suggests adjustments to the voltage to save power
-and meet silicon characteristic requirements.
-
-- compatible:
-	Usage: required
-	Value type: <string>
-	Definition: should be "qcom,qcs404-cpr", "qcom,cpr" for qcs404
-
-- reg:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: base address and size of the rbcpr register region
-
-- interrupts:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: should specify the CPR interrupt
-
-- clocks:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: phandle to the reference clock
-
-- clock-names:
-	Usage: required
-	Value type: <stringlist>
-	Definition: must be "ref"
-
-- vdd-apc-supply:
-	Usage: required
-	Value type: <phandle>
-	Definition: phandle to the vdd-apc-supply regulator
-
-- #power-domain-cells:
-	Usage: required
-	Value type: <u32>
-	Definition: should be 0
-
-- operating-points-v2:
-	Usage: required
-	Value type: <phandle>
-	Definition: A phandle to the OPP table containing the
-		    performance states supported by the CPR
-		    power domain
-
-- acc-syscon:
-	Usage: optional
-	Value type: <phandle>
-	Definition: phandle to syscon for writing ACC settings
-
-- nvmem-cells:
-	Usage: required
-	Value type: <phandle>
-	Definition: phandle to nvmem cells containing the data
-		    that makes up a fuse corner, for each fuse corner.
-		    As well as the CPR fuse revision.
-
-- nvmem-cell-names:
-	Usage: required
-	Value type: <stringlist>
-	Definition: should be "cpr_quotient_offset1", "cpr_quotient_offset2",
-		    "cpr_quotient_offset3", "cpr_init_voltage1",
-		    "cpr_init_voltage2", "cpr_init_voltage3", "cpr_quotient1",
-		    "cpr_quotient2", "cpr_quotient3", "cpr_ring_osc1",
-		    "cpr_ring_osc2", "cpr_ring_osc3", "cpr_fuse_revision"
-		    for qcs404.
-
-Example:
-
-	cpr_opp_table: cpr-opp-table {
-		compatible = "operating-points-v2-qcom-level";
-
-		cpr_opp1: opp1 {
-			opp-level = <1>;
-			qcom,opp-fuse-level = <1>;
-		};
-		cpr_opp2: opp2 {
-			opp-level = <2>;
-			qcom,opp-fuse-level = <2>;
-		};
-		cpr_opp3: opp3 {
-			opp-level = <3>;
-			qcom,opp-fuse-level = <3>;
-		};
-	};
-
-	power-controller@b018000 {
-		compatible = "qcom,qcs404-cpr", "qcom,cpr";
-		reg = <0x0b018000 0x1000>;
-		interrupts = <0 15 IRQ_TYPE_EDGE_RISING>;
-		clocks = <&xo_board>;
-		clock-names = "ref";
-		vdd-apc-supply = <&pms405_s3>;
-		#power-domain-cells = <0>;
-		operating-points-v2 = <&cpr_opp_table>;
-		acc-syscon = <&tcsr>;
-
-		nvmem-cells = <&cpr_efuse_quot_offset1>,
-			<&cpr_efuse_quot_offset2>,
-			<&cpr_efuse_quot_offset3>,
-			<&cpr_efuse_init_voltage1>,
-			<&cpr_efuse_init_voltage2>,
-			<&cpr_efuse_init_voltage3>,
-			<&cpr_efuse_quot1>,
-			<&cpr_efuse_quot2>,
-			<&cpr_efuse_quot3>,
-			<&cpr_efuse_ring1>,
-			<&cpr_efuse_ring2>,
-			<&cpr_efuse_ring3>,
-			<&cpr_efuse_revision>;
-		nvmem-cell-names = "cpr_quotient_offset1",
-			"cpr_quotient_offset2",
-			"cpr_quotient_offset3",
-			"cpr_init_voltage1",
-			"cpr_init_voltage2",
-			"cpr_init_voltage3",
-			"cpr_quotient1",
-			"cpr_quotient2",
-			"cpr_quotient3",
-			"cpr_ring_osc1",
-			"cpr_ring_osc2",
-			"cpr_ring_osc3",
-			"cpr_fuse_revision";
-	};
diff --git a/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
new file mode 100644
index 000000000000..852eb36eea93
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
@@ -0,0 +1,161 @@ 
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/power/avs/qcom,cpr.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Core Power Reduction (CPR) bindings
+
+maintainers:
+  - Niklas Cassel <nks@flawful.org>
+
+description: |
+  CPR (Core Power Reduction) is a technology to reduce core power on a CPU
+  or other device. Each OPP of a device corresponds to a "corner" that has
+  a range of valid voltages for a particular frequency. While the device is
+  running at a particular frequency, CPR monitors dynamic factors such as
+  temperature, etc. and suggests adjustments to the voltage to save power
+  and meet silicon characteristic requirements.
+
+properties:
+  compatible:
+    allOf:
+      - items:
+          - enum:
+              - qcom,qcs404-cpr
+          - const: qcom,cpr
+
+  reg:
+    description: Base address and size of the RBCPR register region.
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Reference clock.
+
+  clock-names:
+    items:
+      - const: ref
+
+  vdd-apc-supply:
+    description: APC regulator supply.
+
+  '#power-domain-cells':
+    const: 0
+
+  operating-points-v2:
+    description: |
+      A phandle to the OPP table containing the performance states
+      supported by the CPR power domain.
+
+  acc-syscon:
+    description: A phandle to the syscon used for writing ACC settings.
+
+  nvmem-cells:
+    items:
+      - description: Corner 1 quotient offset
+      - description: Corner 2 quotient offset
+      - description: Corner 3 quotient offset
+      - description: Corner 1 initial voltage
+      - description: Corner 2 initial voltage
+      - description: Corner 3 initial voltage
+      - description: Corner 1 quotient
+      - description: Corner 2 quotient
+      - description: Corner 3 quotient
+      - description: Corner 1 ring oscillator
+      - description: Corner 2 ring oscillator
+      - description: Corner 3 ring oscillator
+      - description: Fuse revision
+
+  nvmem-cell-names:
+    items:
+      - const: cpr_quotient_offset1
+      - const: cpr_quotient_offset2
+      - const: cpr_quotient_offset3
+      - const: cpr_init_voltage1
+      - const: cpr_init_voltage2
+      - const: cpr_init_voltage3
+      - const: cpr_quotient1
+      - const: cpr_quotient2
+      - const: cpr_quotient3
+      - const: cpr_ring_osc1
+      - const: cpr_ring_osc2
+      - const: cpr_ring_osc3
+      - const: cpr_fuse_revision
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+  - clock-names
+  - vdd-apc-supply
+  - '#power-domain-cells'
+  - operating-points-v2
+  - nvmem-cells
+  - nvmem-cell-names
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    cpr_opp_table: cpr-opp-table {
+        compatible = "operating-points-v2-qcom-level";
+
+        cpr_opp1: opp1 {
+            opp-level = <1>;
+            qcom,opp-fuse-level = <1>;
+        };
+        cpr_opp2: opp2 {
+            opp-level = <2>;
+            qcom,opp-fuse-level = <2>;
+        };
+        cpr_opp3: opp3 {
+            opp-level = <3>;
+            qcom,opp-fuse-level = <3>;
+        };
+    };
+
+    power-controller@b018000 {
+        compatible = "qcom,qcs404-cpr", "qcom,cpr";
+        reg = <0x0b018000 0x1000>;
+        interrupts = <0 15 IRQ_TYPE_EDGE_RISING>;
+        clocks = <&xo_board>;
+        clock-names = "ref";
+        vdd-apc-supply = <&pms405_s3>;
+        #power-domain-cells = <0>;
+        operating-points-v2 = <&cpr_opp_table>;
+        acc-syscon = <&tcsr>;
+
+        nvmem-cells = <&cpr_efuse_quot_offset1>,
+            <&cpr_efuse_quot_offset2>,
+            <&cpr_efuse_quot_offset3>,
+            <&cpr_efuse_init_voltage1>,
+            <&cpr_efuse_init_voltage2>,
+            <&cpr_efuse_init_voltage3>,
+            <&cpr_efuse_quot1>,
+            <&cpr_efuse_quot2>,
+            <&cpr_efuse_quot3>,
+            <&cpr_efuse_ring1>,
+            <&cpr_efuse_ring2>,
+            <&cpr_efuse_ring3>,
+            <&cpr_efuse_revision>;
+        nvmem-cell-names = "cpr_quotient_offset1",
+            "cpr_quotient_offset2",
+            "cpr_quotient_offset3",
+            "cpr_init_voltage1",
+            "cpr_init_voltage2",
+            "cpr_init_voltage3",
+            "cpr_quotient1",
+            "cpr_quotient2",
+            "cpr_quotient3",
+            "cpr_ring_osc1",
+            "cpr_ring_osc2",
+            "cpr_ring_osc3",
+            "cpr_fuse_revision";
+    };
diff --git a/MAINTAINERS b/MAINTAINERS
index a7d86182fa6b..9ebbccb0494e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15746,7 +15746,7 @@  M:	Niklas Cassel <nks@flawful.org>
 L:	linux-pm@vger.kernel.org
 L:	linux-arm-msm@vger.kernel.org
 S:	Maintained
-F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
+F:	Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
 F:	drivers/soc/qcom/cpr.c
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096