[PATCH 0/3] pinctrl: scmi: support i.MX95 OEM extensions

[PATCH 0/3] pinctrl: scmi: support i.MX95 OEM extensions

[Peng Fan (OSS)]

ARM SCMI v3.2 Table 24 Pin Configuration Type and Enumerations:
'192 -255 OEM specific units'.

i.MX95 System Manager FW supports SCMI PINCTRL protocol, but uses
OEM Pin Configuration type, so extend the driver to support custom
params.

This patchset depends on [1].

[1] https://lore.kernel.org/all/20240412-pinctrl-scmi-v9-0-b817344d3a9a@nxp.com/

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
Peng Fan (3):
      dt-bindings: pinctrl: support i.MX95 SCMI pinctrl
      dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl
      pinctrl: scmi: support i.MX OEM pin configuration type

 .../devicetree/bindings/firmware/arm,scmi.yaml     |  8 ++--
 .../bindings/pinctrl/nxp,imx95-pinctrl.yaml        | 44 ++++++++++++++++++++++
 drivers/pinctrl/pinctrl-scmi.c                     | 23 +++++++++++
 drivers/pinctrl/pinctrl-scmi.h                     | 15 ++++++++
 4 files changed, 87 insertions(+), 3 deletions(-)
---
base-commit: 6bd4dec347319b2e0b713a88956470e352f493fa
change-id: 20240412-pinctrl-scmi-oem-v1-494ca2ab1480

Best regards,
-- 
Peng Fan <peng.fan@nxp.com>

[PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl

[Peng Fan (OSS)]

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

i.MX95 Pinctrl is managed by SCMI firmware using OEM extensions. This
patch is to add i.MX95 Pinctrl OEM extensions properties.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 .../bindings/pinctrl/nxp,imx95-pinctrl.yaml        | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
new file mode 100644
index 000000000000..4bf7a6192813
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+# Copyright 2024 NXP
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/nxp,imx95-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: i.MX System Control and Management Interface (SCMI) Pinctrl Protocol
+
+maintainers:
+  - Peng Fan <peng.fan@arm.com>
+
+patternProperties:
+  '-pins$': false
+  'grp$':
+    type: object
+
+    properties:
+      $nodename:
+        pattern: "^[0-9a-f]+$"
+
+      pins:
+        $ref: /schemas/types.yaml#/definitions/string
+        description: name of the pin
+
+      nxp,func-id:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: high impedance mode ("third-state", "floating")
+
+      nxp,pin-conf:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: latch weakly
+
+      nxp,daisy-id:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: pull up the pin. Takes as optional argument on hardware
+          supporting it the pull strength in Ohm.
+
+      nxp,daisy-conf:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: pull down the pin. Takes as optional argument on hardware
+          supporting it the pull strength in Ohm.
+
+additionalProperties: true

-- 
2.37.1

Re: [PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl

[Frank Li]

On Fri, Apr 12, 2024 at 08:29:25AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> i.MX95 Pinctrl is managed by SCMI firmware using OEM extensions. This
> patch is to add i.MX95 Pinctrl OEM extensions properties.


Describe your changes in imperative mood, e.g. “make xyzzy do frotz” ...

"Add properties for i.MX95 Pinctrl OEM extensions."

> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  .../bindings/pinctrl/nxp,imx95-pinctrl.yaml        | 44 ++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> new file mode 100644
> index 000000000000..4bf7a6192813
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> @@ -0,0 +1,44 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +# Copyright 2024 NXP
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/pinctrl/nxp,imx95-pinctrl.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: i.MX System Control and Management Interface (SCMI) Pinctrl Protocol
> +
> +maintainers:
> +  - Peng Fan <peng.fan@arm.com>
> +
> +patternProperties:
> +  '-pins$': false
> +  'grp$':
> +    type: object
> +
> +    properties:
> +      $nodename:
> +        pattern: "^[0-9a-f]+$"
> +
> +      pins:
> +        $ref: /schemas/types.yaml#/definitions/string
> +        description: name of the pin
> +
> +      nxp,func-id:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: high impedance mode ("third-state", "floating")
> +
> +      nxp,pin-conf:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: latch weakly
> +
> +      nxp,daisy-id:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: pull up the pin. Takes as optional argument on hardware
> +          supporting it the pull strength in Ohm.
> +
> +      nxp,daisy-conf:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: pull down the pin. Takes as optional argument on hardware
> +          supporting it the pull strength in Ohm.
> +
> +additionalProperties: true
> 
> -- 
> 2.37.1
> 

RE: [PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl

[Peng Fan]

> Subject: Re: [PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl
> 
> On Fri, Apr 12, 2024 at 08:29:25AM +0800, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > i.MX95 Pinctrl is managed by SCMI firmware using OEM extensions. This
> > patch is to add i.MX95 Pinctrl OEM extensions properties.
> 
> 
> Describe your changes in imperative mood, e.g. “make xyzzy do frotz” ...
> 
> "Add properties for i.MX95 Pinctrl OEM extensions."

ok. I will update in v2.

Regards,
Peng.

> 
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  .../bindings/pinctrl/nxp,imx95-pinctrl.yaml        | 44
> ++++++++++++++++++++++
> >  1 file changed, 44 insertions(+)
> >
> > diff --git
> > a/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> > b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> > new file mode 100644
> > index 000000000000..4bf7a6192813
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> > @@ -0,0 +1,44 @@
> > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) # Copyright 2024
> > +NXP %YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/pinctrl/nxp,imx95-pinctrl.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: i.MX System Control and Management Interface (SCMI) Pinctrl
> > +Protocol
> > +
> > +maintainers:
> > +  - Peng Fan <peng.fan@arm.com>
> > +
> > +patternProperties:
> > +  '-pins$': false
> > +  'grp$':
> > +    type: object
> > +
> > +    properties:
> > +      $nodename:
> > +        pattern: "^[0-9a-f]+$"
> > +
> > +      pins:
> > +        $ref: /schemas/types.yaml#/definitions/string
> > +        description: name of the pin
> > +
> > +      nxp,func-id:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: high impedance mode ("third-state", "floating")
> > +
> > +      nxp,pin-conf:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: latch weakly
> > +
> > +      nxp,daisy-id:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: pull up the pin. Takes as optional argument on hardware
> > +          supporting it the pull strength in Ohm.
> > +
> > +      nxp,daisy-conf:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: pull down the pin. Takes as optional argument on
> hardware
> > +          supporting it the pull strength in Ohm.
> > +
> > +additionalProperties: true
> >
> > --
> > 2.37.1
> >

Re: [PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl

[Rob Herring]

On Fri, Apr 12, 2024 at 08:29:25AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> i.MX95 Pinctrl is managed by SCMI firmware using OEM extensions. This
> patch is to add i.MX95 Pinctrl OEM extensions properties.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  .../bindings/pinctrl/nxp,imx95-pinctrl.yaml        | 44 ++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> new file mode 100644
> index 000000000000..4bf7a6192813
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> @@ -0,0 +1,44 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +# Copyright 2024 NXP
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/pinctrl/nxp,imx95-pinctrl.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: i.MX System Control and Management Interface (SCMI) Pinctrl Protocol
> +
> +maintainers:
> +  - Peng Fan <peng.fan@arm.com>
> +
> +patternProperties:
> +  '-pins$': false

Why?

> +  'grp$':
> +    type: object

Missing 'additionalProperties: false'

> +
> +    properties:
> +      $nodename:
> +        pattern: "^[0-9a-f]+$"

Drop. That has no effect. You just defined the nodename above.

> +
> +      pins:
> +        $ref: /schemas/types.yaml#/definitions/string
> +        description: name of the pin

Needs to define the possible values.

> +
> +      nxp,func-id:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: high impedance mode ("third-state", "floating")

We already have a standard property for high impendance. You should know 
that since you obviously copied the description...

> +
> +      nxp,pin-conf:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: latch weakly

Same here.

> +
> +      nxp,daisy-id:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: pull up the pin. Takes as optional argument on hardware
> +          supporting it the pull strength in Ohm.

And here...

> +
> +      nxp,daisy-conf:
> +        $ref: /schemas/types.yaml#/definitions/uint32
> +        description: pull down the pin. Takes as optional argument on hardware
> +          supporting it the pull strength in Ohm.

And here...

> +
> +additionalProperties: true
> 
> -- 
> 2.37.1
> 

RE: [PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl

[Peng Fan]

Hi Rob,

> Subject: Re: [PATCH 1/3] dt-bindings: pinctrl: support i.MX95 SCMI pinctrl
> 
> On Fri, Apr 12, 2024 at 08:29:25AM +0800, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > i.MX95 Pinctrl is managed by SCMI firmware using OEM extensions. This
> > patch is to add i.MX95 Pinctrl OEM extensions properties.
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  .../bindings/pinctrl/nxp,imx95-pinctrl.yaml        | 44
> ++++++++++++++++++++++
> >  1 file changed, 44 insertions(+)
> >
> > diff --git
> > a/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> > b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> > new file mode 100644
> > index 000000000000..4bf7a6192813
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/pinctrl/nxp,imx95-pinctrl.yaml
> > @@ -0,0 +1,44 @@
> > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) # Copyright 2024
> > +NXP %YAML 1.2
> > +---
> > +$id:
> > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi
> > +cetree.org%2Fschemas%2Fpinctrl%2Fnxp%2Cimx95-
> pinctrl.yaml%23&data=05%
> >
> +7C02%7Cpeng.fan%40nxp.com%7C4c448715c4ad4cd1f70808dc5d9e6924%
> 7C686ea1
> >
> +d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C638488182142511691%7CU
> nknown%7CT
> >
> +WFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiL
> CJXVC
> >
> +I6Mn0%3D%7C0%7C%7C%7C&sdata=BckWIcVgYU6l8lV6fIpyDIZHt5hCyFdgF
> xaWBUBb9
> > +7s%3D&reserved=0
> > +$schema:
> > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi
> > +cetree.org%2Fmeta-
> schemas%2Fcore.yaml%23&data=05%7C02%7Cpeng.fan%40nx
> >
> +p.com%7C4c448715c4ad4cd1f70808dc5d9e6924%7C686ea1d3bc2b4c6fa9
> 2cd99c5c
> >
> +301635%7C0%7C0%7C638488182142522802%7CUnknown%7CTWFpbGZs
> b3d8eyJWIjoiM
> >
> +C4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7
> C%7C%7
> >
> +C&sdata=1BJASfju905Rua9G2mkNvPKDppN9%2BP5UaxFCbXDtPqo%3D&res
> erved=0
> > +
> > +title: i.MX System Control and Management Interface (SCMI) Pinctrl
> > +Protocol
> > +
> > +maintainers:
> > +  - Peng Fan <peng.fan@arm.com>
> > +
> > +patternProperties:
> > +  '-pins$': false
> 
> Why?

The node will be as blow, there is no
"-pins$".

+&scmi_iomuxc {                                                                                     
+       pinctrl_uart1: uart1grp {                                                                   
+               txd {                                                                               
+                       pins = "uart1txd";                                                          
+                       nxp,func-id = <0>;                                                          
+                       nxp,pin-conf = <0x31e>;                                                     
+               };                                                                                  
+               rxd {                                                                               
+                       pins = "uart1rxd";                                                          
+                       nxp,func-id = <0>;                                                          
+                       nxp,pin-conf = <0x31e>;                                                     
+               };                                                                                  
+       };
> 
> > +  'grp$':
> > +    type: object
> 
> Missing 'additionalProperties: false'

Fix in v2.

> 
> > +
> > +    properties:
> > +      $nodename:
> > +        pattern: "^[0-9a-f]+$"
> 
> Drop. That has no effect. You just defined the nodename above.

This is to define a subnode, as just listed above, "txd" and "rxd".

> 
> > +
> > +      pins:
> > +        $ref: /schemas/types.yaml#/definitions/string
> > +        description: name of the pin
> 
> Needs to define the possible values.

There will be hundreds of pins, I need to list them all here?

> 
> > +
> > +      nxp,func-id:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: high impedance mode ("third-state", "floating")
> 
> We already have a standard property for high impendance. You should know
> that since you obviously copied the description...

My bad. Fix in v2.

> 
> > +
> > +      nxp,pin-conf:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: latch weakly
> 
> Same here.

Fix in v2.

> 
> > +
> > +      nxp,daisy-id:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: pull up the pin. Takes as optional argument on hardware
> > +          supporting it the pull strength in Ohm.
> 
> And here...

Fix in v2.

> 
> > +
> > +      nxp,daisy-conf:
> > +        $ref: /schemas/types.yaml#/definitions/uint32
> > +        description: pull down the pin. Takes as optional argument on
> hardware
> > +          supporting it the pull strength in Ohm.
> 
> And here...

Fix in v2.

Thanks,
Peng.
> 
> > +
> > +additionalProperties: true
> >
> > --
> > 2.37.1
> >

[PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl

[Peng Fan (OSS)]

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

Re: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl

[Frank Li]

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
> 

RE: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl

[Peng Fan]

> Subject: Re: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95
> SCMI Pinctrl
> 
> 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'?

I was thinking to add the whole example including pinctrl/bbm/misc
using a separate patch after all the vendor stuff got accepted.

Thanks,
Peng.

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

Re: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl

[Rob Herring]

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
> 

RE: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl

[Peng Fan]

Hi Rob,

> Subject: Re: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95
> SCMI Pinctrl
> 
> 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...

You mean this not used?
allOf:
  - $ref: '#/$defs/protocol-node'
  - $ref: /schemas/pinctrl/pinctrl.yaml

Or below?
> 
> 
> > +    anyOf:
> > +      - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
> > +      - allOf:
> > +          - $ref: '#/$defs/protocol-node'
> 
> This must always apply and should not be under the anyOf.

I just try in arm,scmi.yaml:
  protocol@19:                                                                                      
    type: object                                                                                    
    allOf:                                                                                          
      - $ref: '#/$defs/protocol-node'                                                               
      - anyOf:                                                                                      
          - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml                                           
          - $ref: /schemas/pinctrl/pinctrl.yaml                                                     
                                                                                                    
    unevaluatedProperties: false  

And in nxp,imx95-pinctrl.yaml:
patternProperties:                                                                                  
  'grp$':                                                                                           
    type: object                                                                                    
    additionalProperties: false                                                                     
                                                                                                    
    patternProperties:                                                                              
      '[a-f0-9]+$':                                                                                 
        type: object                                                                                
        unevaluatedProperties: false     

But the following example always reports: 
                pinctrl_usdhc1: usdhc1grp {                                                       
                    sd1-pin0 {                                                                      
                        pins = "sd1cmd";                                                            
                        nxp,func-id = <0>;                                                          
                        nxp,pin-conf = <0x138e>;                                                    
                    };                                                                              
                };

arm,scmi.example.dtb: scmi: protocol@19: Unevaluated properties are not allowed ('usdhc1grp' was unexpected)

Do you have any suggestions on how to write the yaml correct?

Thanks,
Peng.

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

RE: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95 SCMI Pinctrl

[Peng Fan]

> Subject: RE: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support i.MX95
> SCMI Pinctrl
> 
> Hi Rob,
> 
> > Subject: Re: [PATCH 2/3] dt-bindings: firmware: arm,scmi: support
> > i.MX95 SCMI Pinctrl
> >
> > 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...
> 

After some check, I work out the following:
diff --git a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
index e9d3f043c4ed..26b7395c4326 100644
--- a/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
+++ b/Documentation/devicetree/bindings/firmware/arm,scmi.yaml
@@ -262,9 +262,12 @@ properties:
     patternProperties:
       '-pins$':
         type: object
-        allOf:
-          - $ref: /schemas/pinctrl/pincfg-node.yaml#
-          - $ref: /schemas/pinctrl/pinmux-node.yaml#
+        anyOf:
+          - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
+          - allOf:
+              - $ref: /schemas/pinctrl/pincfg-node.yaml#
+              - $ref: /schemas/pinctrl/pinmux-node.yaml#
+
         unevaluatedProperties: false
 
         description:

The nxp,imx95-pinctrl.yaml:
+patternProperties:
+  '[a-f0-9]+$':
+    type: object
+    unevaluatedProperties: false
+
+    properties:
+      pins:
+        $ref: /schemas/types.yaml#/definitions/string
+        description: name of the pin
+
+      nxp,func-id:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: Indicates the PAD connections which function module
+
+      nxp,pin-conf:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: The PAD configuration
+
+      nxp,daisy-id:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: The select input register ID
+
+      nxp,daisy-conf:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: The select input register value
+
+additionalProperties: true


The node will as below:
           scmi_pinctrl: protocol@19 {                                                             
                reg = <0x19>;                                                                       
                                                                                                    
                sd-pins {                                                                           
                  sd1cmd {                                                                          
                    pins = "sd1cmd";                                                                
                    nxp,func-id = <0>;                                                              
                    nxp,pin-conf = <0x138e>;                                                        
                  };                                                                                
                  sd1data0 {                                                                        
                    pins = "sd1data0";                                                              
                    nxp,func-id = <0>;                                                              
                    nxp,pin-conf = <0x138e>;                                                        
                  };                                                                                
                };

I will use the upper in v2.

Thanks,
Peng.
> You mean this not used?
> allOf:
>   - $ref: '#/$defs/protocol-node'
>   - $ref: /schemas/pinctrl/pinctrl.yaml
> 
> Or below?
> >
> >
> > > +    anyOf:
> > > +      - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
> > > +      - allOf:
> > > +          - $ref: '#/$defs/protocol-node'
> >
> > This must always apply and should not be under the anyOf.
> 
> I just try in arm,scmi.yaml:
>   protocol@19:
>     type: object
>     allOf:
>       - $ref: '#/$defs/protocol-node'
>       - anyOf:
>           - $ref: /schemas/pinctrl/nxp,imx95-pinctrl.yaml
>           - $ref: /schemas/pinctrl/pinctrl.yaml
> 
>     unevaluatedProperties: false
> 
> And in nxp,imx95-pinctrl.yaml:
> patternProperties:
>   'grp$':
>     type: object
>     additionalProperties: false
> 
>     patternProperties:
>       '[a-f0-9]+$':
>         type: object
>         unevaluatedProperties: false
> 
> But the following example always reports:
>                 pinctrl_usdhc1: usdhc1grp {
>                     sd1-pin0 {
>                         pins = "sd1cmd";
>                         nxp,func-id = <0>;
>                         nxp,pin-conf = <0x138e>;
>                     };
>                 };
> 
> arm,scmi.example.dtb: scmi: protocol@19: Unevaluated properties are not
> allowed ('usdhc1grp' was unexpected)
> 
> Do you have any suggestions on how to write the yaml correct?
> 
> Thanks,
> Peng.
> 
> >
> > > +          - $ref: /schemas/pinctrl/pinctrl.yaml
> > >
> > >      unevaluatedProperties: false
> > >
> > >
> > > --
> > > 2.37.1
> > >

[PATCH 3/3] pinctrl: scmi: support i.MX OEM pin configuration type

[Peng Fan (OSS)]

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

i.MX95 System Manager FW supports SCMI PINCTRL protocol, but uses
OEM Pin Configuration type, so extend the driver to support custom
params.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/pinctrl/pinctrl-scmi.c | 23 +++++++++++++++++++++++
 drivers/pinctrl/pinctrl-scmi.h | 15 +++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c
index 0f55f000a679..97c3d9d4634b 100644
--- a/drivers/pinctrl/pinctrl-scmi.c
+++ b/drivers/pinctrl/pinctrl-scmi.c
@@ -20,6 +20,7 @@
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 
+#include "pinctrl-scmi.h"
 #include "pinctrl-utils.h"
 #include "core.h"
 #include "pinconf.h"
@@ -462,6 +463,23 @@ static const struct pinconf_ops pinctrl_scmi_pinconf_ops = {
 	.pin_config_config_dbg_show = pinconf_generic_dump_config,
 };
 
+static const struct pinconf_generic_params pinctrl_scmi_oem_dt_params[] = {
+	{"nxp,func-id", IMX_SCMI_PIN_MUX, -1},
+	{"nxp,daisy-id", IMX_SCMI_PIN_DAISY_ID, -1},
+	{"nxp,daisy-conf", IMX_SCMI_PIN_DAISY_CFG, -1},
+	{"nxp,pin-conf", IMX_SCMI_PIN_CONF, -1},
+};
+
+#ifdef CONFIG_DEBUG_FS
+static const
+struct pin_config_item pinctrl_scmi_oem_conf_items[ARRAY_SIZE(pinctrl_scmi_oem_dt_params)] = {
+	PCONFDUMP(IMX_SCMI_PIN_MUX, "FUNC-ID", NULL, true),
+	PCONFDUMP(IMX_SCMI_PIN_DAISY_ID, "DAISY-ID", NULL, true),
+	PCONFDUMP(IMX_SCMI_PIN_DAISY_CFG, "DAISY-CFG", NULL, true),
+	PCONFDUMP(IMX_SCMI_PIN_CONF, "PIN-CONF", NULL, true),
+};
+#endif
+
 static int pinctrl_scmi_get_pins(struct scmi_pinctrl *pmx,
 				 struct pinctrl_desc *desc)
 {
@@ -526,6 +544,11 @@ static int scmi_pinctrl_probe(struct scmi_device *sdev)
 	pmx->pctl_desc.pctlops = &pinctrl_scmi_pinctrl_ops;
 	pmx->pctl_desc.pmxops = &pinctrl_scmi_pinmux_ops;
 	pmx->pctl_desc.confops = &pinctrl_scmi_pinconf_ops;
+	pmx->pctl_desc.custom_params = pinctrl_scmi_oem_dt_params;
+	pmx->pctl_desc.num_custom_params = ARRAY_SIZE(pinctrl_scmi_oem_dt_params);
+#ifdef CONFIG_DEBUG_FS
+	pmx->pctl_desc.custom_conf_items = pinctrl_scmi_oem_conf_items;
+#endif
 
 	ret = pinctrl_scmi_get_pins(pmx, &pmx->pctl_desc);
 	if (ret)
diff --git a/drivers/pinctrl/pinctrl-scmi.h b/drivers/pinctrl/pinctrl-scmi.h
new file mode 100644
index 000000000000..fcc61bc19c98
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-scmi.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright 2024 NXP
+ */
+
+#ifndef __DRIVERS_PINCTRL_SCMI_H
+#define __DRIVERS_PINCTRL_SCMI_H
+
+/* OEM VENDOR Pin Configuration Type */
+#define IMX_SCMI_PIN_MUX	192
+#define IMX_SCMI_PIN_CONF	193
+#define IMX_SCMI_PIN_DAISY_ID	194
+#define IMX_SCMI_PIN_DAISY_CFG	195
+
+#endif /* __DRIVERS_PINCTRL_SCMI_H */

-- 
2.37.1