arm64: zynqmp: Label zcu106 with board revision

Not using board revision is causing confusion about which board is
supported and tested. Mark dts files exactly with board revision which was
tested. When new board revision arives it can be symlink if SW view is
the same. Also add -revX suffix to compatible string because user space
tools are parsing this string and can change behavior depends of board
revision.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 510d7a5442fb2a272f73a719a6f22e9de5c5a8f0..5cc86a3a68b20d3e63dbd96f422a94bd2f46dda9 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -125,7 +125,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \
        zynqmp-zcu102-revB.dtb                  \
        zynqmp-zcu102-rev1.0.dtb                \
        zynqmp-zcu104-revA.dtb                  \
-       zynqmp-zcu106.dtb                       \
+       zynqmp-zcu106-revA.dtb                  \
        zynqmp-zc1232-revA.dtb                  \
        zynqmp-zc1751-xm015-dc1.dtb             \
        zynqmp-zc1751-xm016-dc2.dtb             \

diff --git a/arch/arm/dts/zynqmp-zcu106.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
similarity index 99%
rename from arch/arm/dts/zynqmp-zcu106.dts
rename to arch/arm/dts/zynqmp-zcu106-revA.dts
index 9e2193fe2d192adb50a47ca5bc70f62a9009b8c5..14a64f9e1bccf81e1738b22def302236601883fd 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -18,7 +18,7 @@
 
 / {
        model = "ZynqMP ZCU106 RevA";
-       compatible = "xlnx,zynqmp-zcu106", "xlnx,zynqmp";
+       compatible = "xlnx,zynqmp-zcu106-revA", "xlnx,zynqmp-zcu106", "xlnx,zynqmp";
 
        aliases {
                ethernet0 = &gem3;

diff --git a/configs/xilinx_zynqmp_zcu106_defconfig b/configs/xilinx_zynqmp_zcu106_revA_defconfig
similarity index 97%
rename from configs/xilinx_zynqmp_zcu106_defconfig
rename to configs/xilinx_zynqmp_zcu106_revA_defconfig
index 0ea13c9fe4bdcd4517e09f0b0bd6c8667537142f..175b4d086d3cf0d0b8ffc926d22663e2c5657f3d 100644 (file)
--- a/configs/xilinx_zynqmp_zcu106_defconfig
+++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig
@@ -6,7 +6,7 @@ CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU106"
 CONFIG_SYS_TEXT_BASE=0x8000000
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106"
+CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA"
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y