arm64: zynqmp: Sync names for SC with Versal

ZynqMP based System controller is present on Versal boards. This patch is
aligning names with Versal to follow the spec.

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3b8dc2f56fd2beaedaaa489055eb9f68f2b0ef1f..d9aaf128add4d4497fe6b7f5f0e1098c537289fc 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -250,9 +250,9 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \
        avnet-ultra96-rev1.dtb                  \
        avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dtb        \
        zynqmp-a2197-revA.dtb                   \
-       zynqmp-a2197-g-revA.dtb                 \
-       zynqmp-a2197-m-revA.dtb                 \
-       zynqmp-a2197-p-revA.dtb                 \
+       zynqmp-g-a2197-00-revA.dtb              \
+       zynqmp-m-a2197-01-revA.dtb              \
+       zynqmp-p-a2197-00-revA.dtb              \
        zynqmp-mini.dtb                         \
        zynqmp-mini-emmc0.dtb                   \
        zynqmp-mini-emmc1.dtb                   \

diff --git a/arch/arm/dts/zynqmp-a2197-g-revA.dts b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
similarity index 99%
rename from arch/arm/dts/zynqmp-a2197-g-revA.dts
rename to arch/arm/dts/zynqmp-g-a2197-00-revA.dts
index c6072b5f42730a2978db2dd886c75af9a31e708c..ae834bc2a692f27c37740020a5a71e8ac5e3cfca 100644 (file)
--- a/arch/arm/dts/zynqmp-a2197-g-revA.dts
+++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
@@ -14,7 +14,7 @@
 
 / {
        model = "Versal System Controller on a2197 MGT Char board RevA";
-       compatible = "xlnx,zynqmp-a2197-g-revA", "xlnx,zynqmp-a2197-revA",
+       compatible = "xlnx,zynqmp-g-a2197-00-revA", "xlnx,zynqmp-a2197-revA",
                     "xlnx,zynqmp-a2197", "xlnx,zynqmp";
 
        aliases {

diff --git a/arch/arm/dts/zynqmp-a2197-m-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
similarity index 99%
rename from arch/arm/dts/zynqmp-a2197-m-revA.dts
rename to arch/arm/dts/zynqmp-m-a2197-01-revA.dts
index e4b45eafe42ee46978c02365017d596b3f443617..65eeea1b26b61578ba99ca887401521f2611fc97 100644 (file)
--- a/arch/arm/dts/zynqmp-a2197-m-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
@@ -14,7 +14,7 @@
 
 / {
        model = "Versal System Controller on a2197 Memory Char board RevA";
-       compatible = "xlnx,zynqmp-a2197-m-revA", "xlnx,zynqmp-a2197-revA",
+       compatible = "xlnx,zynqmp-m-a2197-01-revA", "xlnx,zynqmp-a2197-revA",
                     "xlnx,zynqmp-a2197", "xlnx,zynqmp";
 
        aliases {

diff --git a/arch/arm/dts/zynqmp-a2197-p-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
similarity index 99%
rename from arch/arm/dts/zynqmp-a2197-p-revA.dts
rename to arch/arm/dts/zynqmp-p-a2197-00-revA.dts
index 322b36e391a7701554f18d1a18e27beb3c97a08c..f49da8162a018dda94e9e82b45be6948bed81897 100644 (file)
--- a/arch/arm/dts/zynqmp-a2197-p-revA.dts
+++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
@@ -14,7 +14,7 @@
 
 / {
        model = "Versal System Controller on a2197 Processor Char board RevA"; /* Tenzing */
-       compatible = "xlnx,zynqmp-a2197-p-revA", "xlnx,zynqmp-a2197-revA",
+       compatible = "xlnx,zynqmp-p-a2197-00-revA", "xlnx,zynqmp-a2197-revA",
                     "xlnx,zynqmp-a2197", "xlnx,zynqmp";
 
        aliases {

diff --git a/configs/xilinx_zynqmp_a2197_revA_defconfig b/configs/xilinx_zynqmp_a2197_revA_defconfig
index 3498483f4b78060f52368c1cc4149dc225bdebef..5acf7010733903dbb9bee7ebb213e2f432963353 100644 (file)
--- a/configs/xilinx_zynqmp_a2197_revA_defconfig
+++ b/configs/xilinx_zynqmp_a2197_revA_defconfig
@@ -43,7 +43,7 @@ CONFIG_CMD_TIMER=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-revA"
-CONFIG_OF_LIST="zynqmp-a2197-revA zynqmp-a2197-g-revA zynqmp-a2197-p-revA zynqmp-a2197-m-revA"
+CONFIG_OF_LIST="zynqmp-a2197-revA zynqmp-g-a2197-00-revA zynqmp-p-a2197-00-revA zynqmp-m-a2197-01-revA"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/xilinx_zynqmp_a2197_m_revA_defconfig b/configs/xilinx_zynqmp_g_a2197_00_revA_defconfig
similarity index 98%
rename from configs/xilinx_zynqmp_a2197_m_revA_defconfig
rename to configs/xilinx_zynqmp_g_a2197_00_revA_defconfig
index fb4020b2dfed89e7787d44eb5516c8b9bb2c92ec..9cc9191a4138c02e27d95eae5ac7650b790eb164 100644 (file)
--- a/configs/xilinx_zynqmp_a2197_m_revA_defconfig
+++ b/configs/xilinx_zynqmp_g_a2197_00_revA_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-m-revA"
+CONFIG_DEFAULT_DEVICE_TREE="zynqmp-g-a2197-00-revA"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/xilinx_zynqmp_a2197_g_revA_defconfig b/configs/xilinx_zynqmp_m_a2197_01_revA_defconfig
similarity index 98%
rename from configs/xilinx_zynqmp_a2197_g_revA_defconfig
rename to configs/xilinx_zynqmp_m_a2197_01_revA_defconfig
index 47a98c6d4d8bce1ccd528a52683f903ec3aef42d..ea6c6b9b01226ba80f2d45134c01819a062a98ec 100644 (file)
--- a/configs/xilinx_zynqmp_a2197_g_revA_defconfig
+++ b/configs/xilinx_zynqmp_m_a2197_01_revA_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-g-revA"
+CONFIG_DEFAULT_DEVICE_TREE="zynqmp-m-a2197-01-revA"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/xilinx_zynqmp_a2197_p_revA_defconfig b/configs/xilinx_zynqmp_p_a2197_00_revA_defconfig
similarity index 98%
rename from configs/xilinx_zynqmp_a2197_p_revA_defconfig
rename to configs/xilinx_zynqmp_p_a2197_00_revA_defconfig
index d19c6b34cac61f87c0b250144a2f5789af7223fd..a7c4c79ebafb2828f48a946c64ccd166df6d59c5 100644 (file)
--- a/configs/xilinx_zynqmp_a2197_p_revA_defconfig
+++ b/configs/xilinx_zynqmp_p_a2197_00_revA_defconfig
@@ -43,7 +43,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-a2197-p-revA"
+CONFIG_DEFAULT_DEVICE_TREE="zynqmp-p-a2197-00-revA"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y