When DT overlay is applied at run time compatible string or model AFAIK is
not updated. But when fdtoverlay tool is used it actually creates full
description for used SOM and carrier card(CC). That's why there is no
reason to use generic SOM name and its compatible strings because they are
not properly reflected in newly created DT.
Composing dt overlays together was introduced by commit 7a4c31ee877a
("arm64: zynqmp: Add support for Xilinx Kria SOM board") and later renamed
by commit 45fe0dc4ea2e ("arm64: xilinx: Use zynqmp prefix for SOM dt
overlays").
DTB selection is done prior booting OS that's why there is no need to do
run time composition for SOM and CC combination. And user space can use
compatible string and all listed revisions to figured it out which SOM and
CC combinations OS is running at.
Signed-off-by: Michal Simek <[email protected]>
---
We are using U-Boot DTB reselection feature to identify SOM + CC
combination.
This patch depends on
https://lore.kernel.org/r/90e1a393154c3d87e8ee7dc9eef07fc937c1eaf7.1706019397.git.michal.simek@amd.com
---
.../bindings/soc/xilinx/xilinx.yaml | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
index 7c75dbb4f307..131aba5ed9f4 100644
--- a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
+++ b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
@@ -148,6 +148,40 @@ properties:
- contains:
const: xlnx,zynqmp-smk-k26
+ - description: Xilinx Kria SOM KV260 revA/Y/Z
+ minItems: 3
+ items:
+ enum:
+ - xlnx,zynqmp-sk-kv260-revA
+ - xlnx,zynqmp-sk-kv260-revY
+ - xlnx,zynqmp-sk-kv260-revZ
+ - xlnx,zynqmp-sk-kv260
+ - xlnx,zynqmp
+ allOf:
+ - contains:
+ const: xlnx,zynqmp-sk-kv260-revA
+ - contains:
+ const: xlnx,zynqmp-sk-kv260
+ - contains:
+ const: xlnx,zynqmp
+
+ - description: Xilinx Kria SOM KV260 rev2/1/B
+ minItems: 3
+ items:
+ enum:
+ - xlnx,zynqmp-sk-kv260-rev2
+ - xlnx,zynqmp-sk-kv260-rev1
+ - xlnx,zynqmp-sk-kv260-revB
+ - xlnx,zynqmp-sk-kv260
+ - xlnx,zynqmp
+ allOf:
+ - contains:
+ const: xlnx,zynqmp-sk-kv260-revB
+ - contains:
+ const: xlnx,zynqmp-sk-kv260
+ - contains:
+ const: xlnx,zynqmp
+
- description: AMD MicroBlaze V (QEMU)
items:
- const: qemu,mbv
--
2.36.1
On Tue, 23 Jan 2024 15:23:08 +0100, Michal Simek wrote:
> When DT overlay is applied at run time compatible string or model AFAIK is
> not updated. But when fdtoverlay tool is used it actually creates full
> description for used SOM and carrier card(CC). That's why there is no
> reason to use generic SOM name and its compatible strings because they are
> not properly reflected in newly created DT.
> Composing dt overlays together was introduced by commit 7a4c31ee877a
> ("arm64: zynqmp: Add support for Xilinx Kria SOM board") and later renamed
> by commit 45fe0dc4ea2e ("arm64: xilinx: Use zynqmp prefix for SOM dt
> overlays").
> DTB selection is done prior booting OS that's why there is no need to do
> run time composition for SOM and CC combination. And user space can use
> compatible string and all listed revisions to figured it out which SOM and
> CC combinations OS is running at.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
>
> We are using U-Boot DTB reselection feature to identify SOM + CC
> combination.
>
> This patch depends on
> https://lore.kernel.org/r/90e1a393154c3d87e8ee7dc9eef07fc937c1eaf7.1706019397.git.michal.simek@amd.com
>
> ---
> .../bindings/soc/xilinx/xilinx.yaml | 34 +++++++++++++++++++
> 1 file changed, 34 insertions(+)
>
Reviewed-by: Rob Herring <[email protected]>
On 1/23/24 15:23, Michal Simek wrote:
> When DT overlay is applied at run time compatible string or model AFAIK is
> not updated. But when fdtoverlay tool is used it actually creates full
> description for used SOM and carrier card(CC). That's why there is no
> reason to use generic SOM name and its compatible strings because they are
> not properly reflected in newly created DT.
> Composing dt overlays together was introduced by commit 7a4c31ee877a
> ("arm64: zynqmp: Add support for Xilinx Kria SOM board") and later renamed
> by commit 45fe0dc4ea2e ("arm64: xilinx: Use zynqmp prefix for SOM dt
> overlays").
> DTB selection is done prior booting OS that's why there is no need to do
> run time composition for SOM and CC combination. And user space can use
> compatible string and all listed revisions to figured it out which SOM and
> CC combinations OS is running at.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
>
> We are using U-Boot DTB reselection feature to identify SOM + CC
> combination.
>
> This patch depends on
> https://lore.kernel.org/r/90e1a393154c3d87e8ee7dc9eef07fc937c1eaf7.1706019397.git.michal.simek@amd.com
>
> ---
> .../bindings/soc/xilinx/xilinx.yaml | 34 +++++++++++++++++++
> 1 file changed, 34 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
> index 7c75dbb4f307..131aba5ed9f4 100644
> --- a/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
> +++ b/Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
> @@ -148,6 +148,40 @@ properties:
> - contains:
> const: xlnx,zynqmp-smk-k26
>
> + - description: Xilinx Kria SOM KV260 revA/Y/Z
> + minItems: 3
> + items:
> + enum:
> + - xlnx,zynqmp-sk-kv260-revA
> + - xlnx,zynqmp-sk-kv260-revY
> + - xlnx,zynqmp-sk-kv260-revZ
> + - xlnx,zynqmp-sk-kv260
> + - xlnx,zynqmp
> + allOf:
> + - contains:
> + const: xlnx,zynqmp-sk-kv260-revA
> + - contains:
> + const: xlnx,zynqmp-sk-kv260
> + - contains:
> + const: xlnx,zynqmp
> +
> + - description: Xilinx Kria SOM KV260 rev2/1/B
> + minItems: 3
> + items:
> + enum:
> + - xlnx,zynqmp-sk-kv260-rev2
> + - xlnx,zynqmp-sk-kv260-rev1
> + - xlnx,zynqmp-sk-kv260-revB
> + - xlnx,zynqmp-sk-kv260
> + - xlnx,zynqmp
> + allOf:
> + - contains:
> + const: xlnx,zynqmp-sk-kv260-revB
> + - contains:
> + const: xlnx,zynqmp-sk-kv260
> + - contains:
> + const: xlnx,zynqmp
> +
> - description: AMD MicroBlaze V (QEMU)
> items:
> - const: qemu,mbv
Applied.
M