[PATCH v4 1/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

From: Christian Marangi
Date: Thu Jan 26 2023 - 10:00:40 EST


The qcom-cpufreq-nvmem driver supports 2 kind of devices:
- pre-cpr that doesn't have power-domains and base everything on nvmem
cells and multiple named microvolt bindings.
Doesn't need required-opp binding in the opp nodes as they are only
used for genpd based devices.
- cpr-based that require power-domain in the cpu nodes and use various
source to decide the correct voltage and freq
Require required-opp binding since they need to be linked to the
related opp-level.

When the schema was introduced, it was wrongly set to always require these
binding but this is not the case for pre-cpr devices.

Make the power-domain and the required-opp optional and set them required
only for qcs404 based devices.

Fixes: ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")
Signed-off-by: Christian Marangi <ansuelsmth@xxxxxxxxx>
---
Changes v4:
- Explain why required-opp needs to be conditional
- Split additional ref part
Changesv3:
- No change
Changes v2:
- Reword commit description
- Fix condition order
- Add allOf

.../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 62 +++++++++++--------
1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
index 9c086eac6ca7..89e99a198281 100644
--- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
+++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
@@ -17,6 +17,9 @@ description: |
on the CPU OPP in use. The CPUFreq driver sets the CPR power domain level
according to the required OPPs defined in the CPU OPP tables.

+ For old implementation efuses are parsed to select the correct opp table and
+ voltage and CPR is not supported/used.
+
select:
properties:
compatible:
@@ -33,37 +36,46 @@ select:
required:
- compatible

-properties:
- cpus:
- type: object
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,qcs404

- patternProperties:
- '^cpu@[0-9a-f]+$':
- type: object
+ then:
+ properties:
+ cpus:
+ type: object

- properties:
- power-domains:
- maxItems: 1
+ patternProperties:
+ '^cpu@[0-9a-f]+$':
+ type: object

- power-domain-names:
- items:
- - const: cpr
+ properties:
+ power-domains:
+ maxItems: 1

- required:
- - power-domains
- - power-domain-names
+ power-domain-names:
+ items:
+ - const: cpr
+
+ required:
+ - power-domains
+ - power-domain-names

-patternProperties:
- '^opp-table(-[a-z0-9]+)?$':
- if:
- properties:
- compatible:
- const: operating-points-v2-kryo-cpu
- then:
patternProperties:
- '^opp-?[0-9]+$':
- required:
- - required-opps
+ '^opp-table(-[a-z0-9]+)?$':
+ if:
+ properties:
+ compatible:
+ const: operating-points-v2-kryo-cpu
+ then:
+ patternProperties:
+ '^opp-?[0-9]+$':
+ required:
+ - required-opps

additionalProperties: true

--
2.38.1