From: Peng Fan <peng.fan@nxp.com>

i.MX95 SCMI Pinctrl uses OEM specific units, so add '$ref' to
'/schemas/pinctrl/nxp,imx95-pinctrl.yaml' and an example.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
index e9d3f043c4ed..ebc6c083b538 100644
--- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
+++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
@@ -249,9 +249,11 @@ properties:
 
   protocol@19:
     type: object
-    allOf:
-      - $ref: '#/$defs/protocol-node'
-      - $ref: /schemas/pinctrl/pinctrl.yaml
+    anyOf:
+      - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
+      - allOf:
+          - $ref: '#/$defs/protocol-node'
+          - $ref: /schemas/pinctrl/pinctrl.yaml
 
     unevaluatedProperties: false
 

-- 
2.37.1

On Fri, Apr 12, 2024 at 08:29:26AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> i.MX95 SCMI Pinctrl uses OEM specific units, so add '$ref' to
> '/schemas/pinctrl/nxp,imx95-pinctrl.yaml' and an example.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
> index e9d3f043c4ed..ebc6c083b538 100644
> --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
> +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
> @@ -249,9 +249,11 @@ properties:
>  
>    protocol@19:
>      type: object
> -    allOf:
> -      - $ref: '#/$defs/protocol-node'
> -      - $ref: /schemas/pinctrl/pinctrl.yaml

I don't think anything from here was actually used...


> +    anyOf:
> +      - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
> +      - allOf:
> +          - $ref: '#/$defs/protocol-node'

This must always apply and should not be under the anyOf.

> +          - $ref: /schemas/pinctrl/pinctrl.yaml
>  
>      unevaluatedProperties: false
>  
> 
> -- 
> 2.37.1
>

On Fri, Apr 12, 2024 at 08:29:26AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> i.MX95 SCMI Pinctrl uses OEM specific units, so add '$ref' to
> '/schemas/pinctrl/nxp,imx95-pinctrl.yaml' and an example.

where 'example'? 

Frank

> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
> index e9d3f043c4ed..ebc6c083b538 100644
> --- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
> +++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
> @@ -249,9 +249,11 @@ properties:
>  
>    protocol@19:
>      type: object
> -    allOf:
> -      - $ref: '#/$defs/protocol-node'
> -      - $ref: /schemas/pinctrl/pinctrl.yaml
> +    anyOf:
> +      - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
> +      - allOf:
> +          - $ref: '#/$defs/protocol-node'
> +          - $ref: /schemas/pinctrl/pinctrl.yaml
>  
>      unevaluatedProperties: false
>  
> 
> -- 
> 2.37.1
>