From 50d92833477eb582bed7cab9449997c3a39b6f17 Mon Sep 17 00:00:00 2001
From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 28 Jun 2019 13:16:10 +0200
Subject: [PATCH] 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>
---
arch/arm/dts/Makefile | 6 +++---
.../{zynqmp-a2197-g-revA.dts => zynqmp-g-a2197-00-revA.dts} | 2 +-
.../{zynqmp-a2197-m-revA.dts => zynqmp-m-a2197-01-revA.dts} | 2 +-
.../{zynqmp-a2197-p-revA.dts => zynqmp-p-a2197-00-revA.dts} | 2 +-
configs/xilinx_zynqmp_a2197_revA_defconfig | 2 +-
...vA_defconfig => xilinx_zynqmp_g_a2197_00_revA_defconfig} | 2 +-
...vA_defconfig => xilinx_zynqmp_m_a2197_01_revA_defconfig} | 2 +-
...vA_defconfig => xilinx_zynqmp_p_a2197_00_revA_defconfig} | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
rename arch/arm/dts/{zynqmp-a2197-g-revA.dts => zynqmp-g-a2197-00-revA.dts} (99%)
rename arch/arm/dts/{zynqmp-a2197-m-revA.dts => zynqmp-m-a2197-01-revA.dts} (99%)
rename arch/arm/dts/{zynqmp-a2197-p-revA.dts => zynqmp-p-a2197-00-revA.dts} (99%)
rename configs/{xilinx_zynqmp_a2197_m_revA_defconfig => xilinx_zynqmp_g_a2197_00_revA_defconfig} (98%)
rename configs/{xilinx_zynqmp_a2197_g_revA_defconfig => xilinx_zynqmp_m_a2197_01_revA_defconfig} (98%)
rename configs/{xilinx_zynqmp_a2197_p_revA_defconfig => xilinx_zynqmp_p_a2197_00_revA_defconfig} (98%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3b8dc2f56f..d9aaf128ad 100644
--- 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 c6072b5f42..ae834bc2a6 100644
--- 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 e4b45eafe4..65eeea1b26 100644
--- 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 322b36e391..f49da8162a 100644
--- 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 3498483f4b..5acf701073 100644
--- 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 fb4020b2df..9cc9191a41 100644
--- 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 47a98c6d4d..ea6c6b9b01 100644
--- 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 d19c6b34ca..a7c4c79eba 100644
--- 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
--
2.39.5