diff mbox series

[v7,2/6] dt-bindings: avs: cpr: Convert binding to YAML schema

Message ID 20210901155735.629282-3-angelogioacchino.delregno@somainline.org
State New
Headers show
Series Add support for Core Power Reduction v3, v4 and Hardened | expand

Commit Message

AngeloGioacchino Del Regno Sept. 1, 2021, 3:57 p.m. UTC
Convert the qcom,cpr.txt document to YAML schema and place it in the
appropriate directory, since this driver was moved from power/avs
to soc/qcom, but forgets to move the documentation.

Fixes: a7305e684fcf ("PM: AVS: qcom-cpr: Move the driver to the qcom specific drivers")
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
---
 .../bindings/power/avs/qcom,cpr.txt           | 131 +-------------
 .../bindings/soc/qcom/qcom,cpr.yaml           | 167 ++++++++++++++++++
 MAINTAINERS                                   |   2 +-
 3 files changed, 169 insertions(+), 131 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml

Comments

Rob Herring (Arm) Sept. 7, 2021, 6:28 p.m. UTC | #1
On Wed, Sep 01, 2021 at 05:57:31PM +0200, AngeloGioacchino Del Regno wrote:
> Convert the qcom,cpr.txt document to YAML schema and place it in the

> appropriate directory, since this driver was moved from power/avs

> to soc/qcom, but forgets to move the documentation.

> 

> Fixes: a7305e684fcf ("PM: AVS: qcom-cpr: Move the driver to the qcom specific drivers")

> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>

> ---

>  .../bindings/power/avs/qcom,cpr.txt           | 131 +-------------

>  .../bindings/soc/qcom/qcom,cpr.yaml           | 167 ++++++++++++++++++

>  MAINTAINERS                                   |   2 +-

>  3 files changed, 169 insertions(+), 131 deletions(-)

>  create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml



> diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml

> new file mode 100644

> index 000000000000..20f65427c762

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml

> @@ -0,0 +1,167 @@

> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

> +%YAML 1.2

> +---

> +$id: "http://devicetree.org/schemas/soc/qcom/qcom,cpr.yaml#"

> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"

> +

> +title: Qualcomm Core Power Reduction (CPR)

> +

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

> +

> +maintainers:

> +  - Niklas Cassel <nks@flawful.org>

> +

> +properties:

> +  compatible:

> +    items:

> +      - enum:

> +          - qcom,qcs404-cpr

> +      - const: qcom,cpr

> +

> +  reg:

> +    description: Base address and size of the RBCPR register region

> +    maxItems: 1

> +

> +  interrupts:

> +    maxItems: 1

> +

> +  clock-names:

> +    items:

> +      - const: ref

> +

> +  clocks:

> +    items:

> +      - description: CPR reference clock

> +

> +  vdd-apc-supply:

> +    description: Autonomous Phase Control (APC) power supply

> +

> +  '#power-domain-cells':

> +    const: 0

> +

> +  acc-syscon:

> +    description: phandle to syscon for writing ACC settings


Needs a type reference.

> +

> +  nvmem-cells:

> +    minItems: 9

> +    maxItems: 32

> +    description: Cells containing the fuse corners and revision data

> +

> +  nvmem-cell-names:

> +    minItems: 9

> +    maxItems: 32


There were a bunch of names defined that you dropped.

> +

> +  operating-points-v2: true

> +

> +required:

> +  - compatible

> +  - reg

> +  - interrupts

> +  - clock-names

> +  - clocks

> +  - vdd-apc-supply

> +  - "#power-domain-cells"

> +  - nvmem-cells

> +  - nvmem-cell-names

> +  - operating-points-v2

> +

> +additionalProperties: false

> +

> +examples:

> +  - |

> +    #include <dt-bindings/interrupt-controller/irq.h>

> +

> +    cpus {

> +        #address-cells = <1>;

> +        #size-cells = <0>;

> +

> +        cpu@100 {

> +            compatible = "arm,cortex-a53";

> +            device_type = "cpu";

> +            reg = <0x100>;

> +            operating-points-v2 = <&cpu_opp_table>;

> +            power-domains = <&cpr>;

> +            power-domain-names = "cpr";

> +        };

> +    };

> +

> +    cpu_opp_table: opp-table-cpu {

> +        compatible = "operating-points-v2-kryo-cpu";

> +        opp-shared;

> +

> +        opp-1094400000 {

> +            opp-hz = /bits/ 64 <1094400000>;

> +            required-opps = <&cpr_opp1>;

> +        };

> +        opp-1248000000 {

> +            opp-hz = /bits/ 64 <1248000000>;

> +            required-opps = <&cpr_opp2>;

> +        };

> +        opp-1401600000 {

> +            opp-hz = /bits/ 64 <1401600000>;

> +            required-opps = <&cpr_opp3>;

> +        };

> +    };

> +

> +    cpr_opp_table: opp-table-cpr {

> +        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 = "cpr0_quotient_offset1",

> +                           "cpr0_quotient_offset2",

> +                           "cpr0_quotient_offset3",

> +                           "cpr0_init_voltage1",

> +                           "cpr0_init_voltage2",

> +                           "cpr0_init_voltage3",

> +                           "cpr0_quotient1",

> +                           "cpr0_quotient2",

> +                           "cpr0_quotient3",

> +                           "cpr0_ring_osc1",

> +                           "cpr0_ring_osc2",

> +                           "cpr0_ring_osc3",

> +                           "cpr_fuse_revision";

> +    };

> +...

> diff --git a/MAINTAINERS b/MAINTAINERS

> index f58dad1a1922..90f1db301fae 100644

> --- a/MAINTAINERS

> +++ b/MAINTAINERS

> @@ -15490,7 +15490,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/soc/qcom/qcom,cpr.yaml

>  F:	drivers/soc/qcom/cpr.c

>  

>  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096

> -- 

> 2.32.0

> 

>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt b/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
index ab0d5ebbad4e..2ada8cd08949 100644
--- a/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
+++ b/Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
@@ -1,130 +1 @@ 
-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";
-	};
+This file has been moved to ../../soc/qcom/qcom,cpr.yaml
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml
new file mode 100644
index 000000000000..20f65427c762
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml
@@ -0,0 +1,167 @@ 
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/soc/qcom/qcom,cpr.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm Core Power Reduction (CPR)
+
+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.
+
+maintainers:
+  - Niklas Cassel <nks@flawful.org>
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - qcom,qcs404-cpr
+      - const: qcom,cpr
+
+  reg:
+    description: Base address and size of the RBCPR register region
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clock-names:
+    items:
+      - const: ref
+
+  clocks:
+    items:
+      - description: CPR reference clock
+
+  vdd-apc-supply:
+    description: Autonomous Phase Control (APC) power supply
+
+  '#power-domain-cells':
+    const: 0
+
+  acc-syscon:
+    description: phandle to syscon for writing ACC settings
+
+  nvmem-cells:
+    minItems: 9
+    maxItems: 32
+    description: Cells containing the fuse corners and revision data
+
+  nvmem-cell-names:
+    minItems: 9
+    maxItems: 32
+
+  operating-points-v2: true
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clock-names
+  - clocks
+  - vdd-apc-supply
+  - "#power-domain-cells"
+  - nvmem-cells
+  - nvmem-cell-names
+  - operating-points-v2
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+
+    cpus {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        cpu@100 {
+            compatible = "arm,cortex-a53";
+            device_type = "cpu";
+            reg = <0x100>;
+            operating-points-v2 = <&cpu_opp_table>;
+            power-domains = <&cpr>;
+            power-domain-names = "cpr";
+        };
+    };
+
+    cpu_opp_table: opp-table-cpu {
+        compatible = "operating-points-v2-kryo-cpu";
+        opp-shared;
+
+        opp-1094400000 {
+            opp-hz = /bits/ 64 <1094400000>;
+            required-opps = <&cpr_opp1>;
+        };
+        opp-1248000000 {
+            opp-hz = /bits/ 64 <1248000000>;
+            required-opps = <&cpr_opp2>;
+        };
+        opp-1401600000 {
+            opp-hz = /bits/ 64 <1401600000>;
+            required-opps = <&cpr_opp3>;
+        };
+    };
+
+    cpr_opp_table: opp-table-cpr {
+        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 = "cpr0_quotient_offset1",
+                           "cpr0_quotient_offset2",
+                           "cpr0_quotient_offset3",
+                           "cpr0_init_voltage1",
+                           "cpr0_init_voltage2",
+                           "cpr0_init_voltage3",
+                           "cpr0_quotient1",
+                           "cpr0_quotient2",
+                           "cpr0_quotient3",
+                           "cpr0_ring_osc1",
+                           "cpr0_ring_osc2",
+                           "cpr0_ring_osc3",
+                           "cpr_fuse_revision";
+    };
+...
diff --git a/MAINTAINERS b/MAINTAINERS
index f58dad1a1922..90f1db301fae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15490,7 +15490,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/soc/qcom/qcom,cpr.yaml
 F:	drivers/soc/qcom/cpr.c
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096