[PATCH 1/2 resend] arm64: dts: imx95: Add missing vendor string to SCMI property

[PATCH 1/2 resend] arm64: dts: imx95: Add missing vendor string to SCMI property

[Alexander Stein]

With commit 7bf46ec090b9e ("dt-bindings: firmware: arm,scmi: Add missing
vendor string") this property has 'arm' vendor prefix. Fix the property
name accordingly.

Fixes: 61ed94cd54e3 ("arm64: dts: imx95: set max-rx-timeout-ms")
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
Sorry, there was a mistake while sending the first batch, so patch 1/2
was missing.

 arch/arm64/boot/dts/freescale/imx95.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi
index 62bb526ba507b..d10f62eacfe08 100644
--- a/arch/arm64/boot/dts/freescale/imx95.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95.dtsi
@@ -313,7 +313,7 @@ scmi {
 			shmem = <&scmi_buf0>, <&scmi_buf1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			max-rx-timeout-ms = <5000>;
+			arm,max-rx-timeout-ms = <5000>;
 
 			scmi_devpd: protocol@11 {
 				reg = <0x11>;
-- 
2.34.1

[PATCH 2/2 resend] dt-bindings: firmware: imx95-scmi: Allow linux,code for protocol@81

[Alexander Stein]

BBM protocol supports a single power button, supported by driver
imx-sm-bbm-key.c. By default this is KEY_POWER, but can also be overwritten
using linux,code. Add a reference to this schema and add linux,code as a
supported property.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
Admittedly, I'm not sure if this is the correct way of referencing the
linux,code from input.yaml.

 .../devicetree/bindings/firmware/nxp,imx95-scmi.yaml     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml b/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
index 1a95010a546b1..112c3a3eb1980 100644
--- a/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
+++ b/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
@@ -12,13 +12,18 @@ maintainers:
 
 properties:
   protocol@81:
-    $ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
-    unevaluatedProperties: false
+    type: object
+    allOf:
+      - $ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
+      - $ref: /schemas/input/input.yaml#
+    additionalProperties: false
 
     properties:
       reg:
         const: 0x81
 
+      linux,code: true
+
   protocol@84:
     $ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
     unevaluatedProperties: false
-- 
2.34.1

Re: [PATCH 2/2 resend] dt-bindings: firmware: imx95-scmi: Allow linux,code for protocol@81

[Rob Herring]

On Wed, Oct 30, 2024 at 10:55:52AM +0100, Alexander Stein wrote:
> BBM protocol supports a single power button, supported by driver
> imx-sm-bbm-key.c. By default this is KEY_POWER, but can also be overwritten
> using linux,code. Add a reference to this schema and add linux,code as a
> supported property.
> 
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> ---
> Admittedly, I'm not sure if this is the correct way of referencing the
> linux,code from input.yaml.
> 
>  .../devicetree/bindings/firmware/nxp,imx95-scmi.yaml     | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml b/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
> index 1a95010a546b1..112c3a3eb1980 100644
> --- a/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
> +++ b/Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
> @@ -12,13 +12,18 @@ maintainers:
>  
>  properties:
>    protocol@81:
> -    $ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
> -    unevaluatedProperties: false
> +    type: object
> +    allOf:
> +      - $ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
> +      - $ref: /schemas/input/input.yaml#
> +    additionalProperties: false
>  
>      properties:
>        reg:
>          const: 0x81
>  
> +      linux,code: true

default: ??

> +
>    protocol@84:
>      $ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
>      unevaluatedProperties: false
> -- 
> 2.34.1
> 

Re: [PATCH 1/2 resend] arm64: dts: imx95: Add missing vendor string to SCMI property

[Shawn Guo]

On Wed, Oct 30, 2024 at 10:55:51AM +0100, Alexander Stein wrote:
> With commit 7bf46ec090b9e ("dt-bindings: firmware: arm,scmi: Add missing
> vendor string") this property has 'arm' vendor prefix. Fix the property
> name accordingly.
> 
> Fixes: 61ed94cd54e3 ("arm64: dts: imx95: set max-rx-timeout-ms")
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>

Applied, thanks!