From b18c56a654d6f452178d4c8bc4b67ec35bcb464b Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 3 Aug 2022 14:16:38 -0600 Subject: dt-bindings: arm: psci: Relax and simplify compatible constraints Even PSCI v1.0 compliant implementations may support v0.1 clients (i.e. "arm,psci"). Relax the compatible schema such that an implementation can claim 1.0, 0.2, and 0.1 compatibility. In the process, the schema can be simplified a bit by using 'minItems' instead of separate 'oneOf' entries. Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20220803201639.2552581-1-robh@kernel.org --- Documentation/devicetree/bindings/arm/psci.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/psci.yaml b/Documentation/devicetree/bindings/arm/psci.yaml index dd83ef278af0..3a2c908ff282 100644 --- a/Documentation/devicetree/bindings/arm/psci.yaml +++ b/Documentation/devicetree/bindings/arm/psci.yaml @@ -41,31 +41,26 @@ properties: For implementations complying to PSCI versions prior to 0.2. const: arm,psci - - description: - For implementations complying to PSCI 0.2. - const: arm,psci-0.2 - - description: For implementations complying to PSCI 0.2. Function IDs are not required and should be ignored by an OS with PSCI 0.2 support, but are permitted to be present for compatibility with existing software when "arm,psci" is later in the compatible list. + minItems: 1 items: - const: arm,psci-0.2 - const: arm,psci - - description: - For implementations complying to PSCI 1.0. - const: arm,psci-1.0 - - description: For implementations complying to PSCI 1.0. PSCI 1.0 is backward compatible with PSCI 0.2 with minor specification updates, as defined in the PSCI specification[2]. + minItems: 1 items: - const: arm,psci-1.0 - const: arm,psci-0.2 + - const: arm,psci method: description: The method of calling the PSCI firmware. -- cgit