Hi Marek,

On 18/10/2025 14:00, Marek Vasut wrote:
> Rework the current allOf: section such that all handling of
> clocks/clock-names properties happens first, and all handling
> of power-domains/power-domain-names happens second.

The original layout of the allOf: section was power-domains first, then
clock-domains. The actual ordering really doesn't matter, but I wonder
if it would make for a slightly cleaner patch to do it that way round?
In that instance, you would only have to split apart the section for
thead,th1520-gpu, moving the "special single power domain" part and "3
clocks" part into their appropriate positions.

> 
> This allows the allOf section to limit various GPU models to
> matching clocks count in the first half, and apply the same
> for power-domains count in the second half, without conflating
> the two limits together.

Sounds good to me :)

Cheers,
Matt

> 
> This makes addition of GPU models with different clocks and
> power-domains count easier. No functional change intended.
> 
> Signed-off-by: Marek Vasut <[email protected]>
> ---
> Cc: Adam Ford <[email protected]>
> Cc: Conor Dooley <[email protected]>
> Cc: David Airlie <[email protected]>
> Cc: Frank Binns <[email protected]>
> Cc: Geert Uytterhoeven <[email protected]>
> Cc: Krzysztof Kozlowski <[email protected]>
> Cc: Kuninori Morimoto <[email protected]>
> Cc: Maarten Lankhorst <[email protected]>
> Cc: Magnus Damm <[email protected]>
> Cc: Matt Coster <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Simona Vetter <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
>  .../bindings/gpu/img,powervr-rogue.yaml       | 40 +++++++++++--------
>  1 file changed, 24 insertions(+), 16 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml 
> b/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
> index bee4ab1a1f805..829febd8e0f40 100644
> --- a/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
> +++ b/Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
> @@ -86,16 +86,13 @@ allOf:
>        properties:
>          compatible:
>            contains:
> -            const: img,img-axe-1-16m
> +            enum:
> +              - ti,am62-gpu
> +              - ti,j721s2-gpu
>      then:
>        properties:
> -        power-domains:
> -          maxItems: 1
> -        power-domain-names:
> +        clocks:
>            maxItems: 1
> -      required:
> -        - power-domains
> -        - power-domain-names
>  
>    - if:
>        properties:
> @@ -108,13 +105,21 @@ allOf:
>            minItems: 3
>          clock-names:
>            minItems: 3
> +
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: img,img-axe-1-16m
> +    then:
> +      properties:
>          power-domains:
> -          items:
> -            - description: The single, unified power domain for the GPU on 
> the
> -                TH1520 SoC, integrating all internal IP power domains.
> -        power-domain-names: false
> +          maxItems: 1
> +        power-domain-names:
> +          maxItems: 1
>        required:
>          - power-domains
> +        - power-domain-names
>  
>    - if:
>        properties:
> @@ -135,13 +140,16 @@ allOf:
>        properties:
>          compatible:
>            contains:
> -            enum:
> -              - ti,am62-gpu
> -              - ti,j721s2-gpu
> +            const: thead,th1520-gpu
>      then:
>        properties:
> -        clocks:
> -          maxItems: 1
> +        power-domains:
> +          items:
> +            - description: The single, unified power domain for the GPU on 
> the
> +                TH1520 SoC, integrating all internal IP power domains.
> +        power-domain-names: false
> +      required:
> +        - power-domains
>  
>  examples:
>    - |


-- 
Matt Coster
E: [email protected]

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to