arm64: zynqmp: Move dts zcu102 to zcu102-revA

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/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile
index d453cda78691bfbd4dd0e632af17307d006cf36e..bbd28dda0847c64bb3530c627e5fbb5eae63f491 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/Makefile
+++ b/arch/arm64/boot/dts/xilinx/Makefile
@@ -9,7 +9,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revA.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revB.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revB-loopback.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revC.dtb
-dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revA.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revB.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
similarity index 99%
rename from arch/arm64/boot/dts/xilinx/zynqmp-zcu102.dts
rename to arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
index 1aec2368d215c8e880a77ef508e5310c37986724..c57a4628d07a2540f11c5175d1a6c663615b1907 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
@@ -1,5 +1,5 @@
 /*
- * dts file for Xilinx ZynqMP ZCU102
+ * dts file for Xilinx ZynqMP ZCU102 RevA
  *
  * (C) Copyright 2015, Xilinx, Inc.
  *
@@ -21,7 +21,7 @@
 
 / {
        model = "ZynqMP ZCU102 RevA";
-       compatible = "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
+       compatible = "xlnx,zynqmp-zcu102-revA", "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
 
        aliases {
                ethernet0 = &gem3;

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
index 701b9792519ca531da22ce8e7a4e97e1a788e5ba..4bf7df39ce1d339064d1a07a7b15de928e167350 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
@@ -11,10 +11,11 @@
  * the License, or (at your option) any later version.
  */
 
-#include "zynqmp-zcu102.dts"
+#include "zynqmp-zcu102-revA.dts"
 
 / {
        model = "ZynqMP ZCU102 RevB";
+       compatible = "xlnx,zynqmp-zcu102-revB", "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
 };
 
 &gem3 {