2024-01-23 14:20:13

by Michal Simek

Subject: [PATCH v3] dt-bindings: soc: xilinx: Add support for K26 rev2 SOMs

Revision 2 is SW compatible with revision 1 but it is necessary to reflect
it in model and compatible properties which are parsed by user space.
Rev 2 has improved a power on boot reset and MIO34 shutdown glich
improvement done via an additional filter in the GreenPak chip.

Signed-off-by: Michal Simek <[email protected]>
---

Changes in v3:
- use allOf contains structure to avoid random chars caused by
additionalItems: true

Changes in v2:
- Support older combinations

I want to support all versions we created:
All of them:
-rev2, -rev1, -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"

rev1:
-rev1, -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"

revB:
-revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"

revA:
-revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"

And also single one are permitted:
-revB, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
-rev1, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
-rev2, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"

I didn't find a way to pretty much all the time force that there must be
both "xlnx,zynqmp-smk-k26", "xlnx,zynqmp" that's why there is only
requested to have xlnx,zynqmp. If you find a way how to encode it please
let me know.

---
.../bindings/soc/xilinx/xilinx.yaml | 36 +++++++++++++------
1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
index d4c0fe1fe435..7c75dbb4f307 100644
--- a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
+++ b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
@@ -117,20 +117,36 @@ properties:
- const: xlnx,zynqmp

- description: Xilinx Kria SOMs
+ minItems: 3
items:
- - const: xlnx,zynqmp-sm-k26-rev1
- - const: xlnx,zynqmp-sm-k26-revB
- - const: xlnx,zynqmp-sm-k26-revA
- - const: xlnx,zynqmp-sm-k26
- - const: xlnx,zynqmp
+ enum:
+ - xlnx,zynqmp-sm-k26-rev2
+ - xlnx,zynqmp-sm-k26-rev1
+ - xlnx,zynqmp-sm-k26-revB
+ - xlnx,zynqmp-sm-k26-revA
+ - xlnx,zynqmp-sm-k26
+ - xlnx,zynqmp
+ allOf:
+ - contains:
+ const: xlnx,zynqmp
+ - contains:
+ const: xlnx,zynqmp-sm-k26

- description: Xilinx Kria SOMs (starter)
+ minItems: 3
items:
- - const: xlnx,zynqmp-smk-k26-rev1
- - const: xlnx,zynqmp-smk-k26-revB
- - const: xlnx,zynqmp-smk-k26-revA
- - const: xlnx,zynqmp-smk-k26
- - const: xlnx,zynqmp
+ enum:
+ - xlnx,zynqmp-smk-k26-rev2
+ - xlnx,zynqmp-smk-k26-rev1
+ - xlnx,zynqmp-smk-k26-revB
+ - xlnx,zynqmp-smk-k26-revA
+ - xlnx,zynqmp-smk-k26
+ - xlnx,zynqmp
+ allOf:
+ - contains:
+ const: xlnx,zynqmp
+ - contains:
+ const: xlnx,zynqmp-smk-k26

- description: AMD MicroBlaze V (QEMU)
items:
--
2.36.1

2024-01-30 21:01:59

by Rob Herring

Subject: Re: [PATCH v3] dt-bindings: soc: xilinx: Add support for K26 rev2 SOMs

On Tue, 23 Jan 2024 15:16:44 +0100, Michal Simek wrote:
> Revision 2 is SW compatible with revision 1 but it is necessary to reflect
> it in model and compatible properties which are parsed by user space.
> Rev 2 has improved a power on boot reset and MIO34 shutdown glich
> improvement done via an additional filter in the GreenPak chip.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
>
> Changes in v3:
> - use allOf contains structure to avoid random chars caused by
> additionalItems: true
>
> Changes in v2:
> - Support older combinations
>
> I want to support all versions we created:
> All of them:
> -rev2, -rev1, -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> rev1:
> -rev1, -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> revB:
> -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> revA:
> -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> And also single one are permitted:
> -revB, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
> -rev1, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
> -rev2, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> I didn't find a way to pretty much all the time force that there must be
> both "xlnx,zynqmp-smk-k26", "xlnx,zynqmp" that's why there is only
> requested to have xlnx,zynqmp. If you find a way how to encode it please
> let me know.
>
> ---
> .../bindings/soc/xilinx/xilinx.yaml | 36 +++++++++++++------
> 1 file changed, 26 insertions(+), 10 deletions(-)
>

Reviewed-by: Rob Herring <[email protected]>

2024-01-31 09:14:35

by Michal Simek

Subject: Re: [PATCH v3] dt-bindings: soc: xilinx: Add support for K26 rev2 SOMs

On 1/23/24 15:16, Michal Simek wrote:
> Revision 2 is SW compatible with revision 1 but it is necessary to reflect
> it in model and compatible properties which are parsed by user space.
> Rev 2 has improved a power on boot reset and MIO34 shutdown glich
> improvement done via an additional filter in the GreenPak chip.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
>
> Changes in v3:
> - use allOf contains structure to avoid random chars caused by
> additionalItems: true
>
> Changes in v2:
> - Support older combinations
>
> I want to support all versions we created:
> All of them:
> -rev2, -rev1, -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> rev1:
> -rev1, -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> revB:
> -revB, -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> revA:
> -revA, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> And also single one are permitted:
> -revB, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
> -rev1, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
> -rev2, "xlnx,zynqmp-smk-k26", "xlnx,zynqmp"
>
> I didn't find a way to pretty much all the time force that there must be
> both "xlnx,zynqmp-smk-k26", "xlnx,zynqmp" that's why there is only
> requested to have xlnx,zynqmp. If you find a way how to encode it please
> let me know.
>
> ---
> .../bindings/soc/xilinx/xilinx.yaml | 36 +++++++++++++------
> 1 file changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
> index d4c0fe1fe435..7c75dbb4f307 100644
> --- a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
> +++ b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
> @@ -117,20 +117,36 @@ properties:
> - const: xlnx,zynqmp
>
> - description: Xilinx Kria SOMs
> + minItems: 3
> items:
> - - const: xlnx,zynqmp-sm-k26-rev1
> - - const: xlnx,zynqmp-sm-k26-revB
> - - const: xlnx,zynqmp-sm-k26-revA
> - - const: xlnx,zynqmp-sm-k26
> - - const: xlnx,zynqmp
> + enum:
> + - xlnx,zynqmp-sm-k26-rev2
> + - xlnx,zynqmp-sm-k26-rev1
> + - xlnx,zynqmp-sm-k26-revB
> + - xlnx,zynqmp-sm-k26-revA
> + - xlnx,zynqmp-sm-k26
> + - xlnx,zynqmp
> + allOf:
> + - contains:
> + const: xlnx,zynqmp
> + - contains:
> + const: xlnx,zynqmp-sm-k26
>
> - description: Xilinx Kria SOMs (starter)
> + minItems: 3
> items:
> - - const: xlnx,zynqmp-smk-k26-rev1
> - - const: xlnx,zynqmp-smk-k26-revB
> - - const: xlnx,zynqmp-smk-k26-revA
> - - const: xlnx,zynqmp-smk-k26
> - - const: xlnx,zynqmp
> + enum:
> + - xlnx,zynqmp-smk-k26-rev2
> + - xlnx,zynqmp-smk-k26-rev1
> + - xlnx,zynqmp-smk-k26-revB
> + - xlnx,zynqmp-smk-k26-revA
> + - xlnx,zynqmp-smk-k26
> + - xlnx,zynqmp
> + allOf:
> + - contains:
> + const: xlnx,zynqmp
> + - contains:
> + const: xlnx,zynqmp-smk-k26
>
> - description: AMD MicroBlaze V (QEMU)
> items:


Applied.
M