change rock-3a mainline dtb filename to rk3568-rock-3a.dtb (#3775)

* change rock-3a mainline dtb filename to rk3568-rock-3a.dtb

* add rock3a DT link for backward compatibility

* change rock3a default dtb name to mainline

* add rock-3a legacy dtb filename rock-3-a
This commit is contained in:
Jianfeng Liu
2022-05-12 01:42:30 +08:00
committed by GitHub
parent 6b72ae3c86
commit 68729a3aa6
4 changed files with 16 additions and 4 deletions

View File

@@ -5,6 +5,6 @@ BOOTCONFIG="rock-3-a-rk3568_defconfig"
KERNEL_TARGET="legacy,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-rock-3-a.dtb"
BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"

View File

@@ -15,6 +15,9 @@ case $BRANCH in
KERNELBRANCH='branch:stable-4.19-rock3'
KERNELDIR='linux-rockchip64'
KERNELPATCHDIR='rk35xx-legacy'
if [[ $BOARD == rock-3a ]]; then
BOOT_FDT_FILE="rockchip/rk3568-rock-3-a.dtb"
fi
;;

View File

@@ -0,0 +1,8 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts
new file mode 120000
index 000000000..81a81de4d
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts
@@ -0,0 +1 @@
+rk3568-rock-3a.dts
\ No newline at end of file

View File

@@ -2,17 +2,18 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
index 479906f3ad7b..bf2a58e3a871 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -58,3 +58,4 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
@@ -58,3 +58,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3-a.dtb
subdir-y := $(dts-dirs) overlay
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
new file mode 100644
index 000000000000..1b898aff9df8
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -0,0 +1,781 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*