From c75d50b4130fd15ee8026f34cf86ec0bda76e5ee Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Sun, 11 Aug 2024 21:12:36 +0200
Subject: [PATCH 1/2] arm64: dts: rockchip: Adopt mainline naming for
 Friendlyelec CM3588 NAS

---
 arch/arm64/boot/dts/rockchip/Makefile                           | 2 +-
 ...nanopc-cm3588-nas.dts => rk3588-friendlyelec-cm3588-nas.dts} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm64/boot/dts/rockchip/{rk3588-nanopc-cm3588-nas.dts => rk3588-friendlyelec-cm3588-nas.dts} (100%)

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 9cd72bbde2bf3..5a2ec0deea223 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -349,7 +349,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-armsom-w3.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-firefly-itx-3588j.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-fxblox-rk1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-hinlink-h88k.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-cm3588-nas.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-friendlyelec-cm3588-nas.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
similarity index 100%
rename from arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts
rename to arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts

From 93eed758603332ab2cdc050e18483e2f791f8f99 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Tue, 20 Aug 2024 21:41:19 +0200
Subject: [PATCH 2/2] arm64: dts: rockchip: Add backwards compatibility support
 for CM3588 NAS

Existing installations will try to find the old device tree. Include it as stub/link to the new file.
---
 arch/arm64/boot/dts/rockchip/Makefile                     | 1 +
 arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 5a2ec0deea223..61494209f9b86 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -350,6 +350,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-firefly-itx-3588j.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-fxblox-rk1.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-hinlink-h88k.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-friendlyelec-cm3588-nas.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-cm3588-nas.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts
new file mode 100644
index 0000000000000..54415970831d1
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-cm3588-nas.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include "rk3588-friendlyelec-cm3588-nas.dts"
+
+// DO NOT ADD ANYTHING TO THIS DTS!
+// This file only exists for backwards compatibility for existing installations installed before 2024-08-22.