Merge pull request torvalds#220 from Radxa-Alvin/linux-5.10-gen-rkr4.1

Changes: * Change Radxa Zero 3 devicetree name Signed-off-by: Stephen Chen <[email protected]>
RadxaStephen · Sep 21, 2023 · 9e5cac0 · 9e5cac0
2 parents 3b3527b + c1dc572
commit 9e5cac0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
@@ -129,7 +129,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-rock-3c.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-sodimm-io.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3s-io.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-zero-3w.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-zero3.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-dual-camera.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-linux.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-linux-spi-nor.dtb

diff --git a/...oot/dts/rockchip/rk3566-radxa-zero-3w.dts → .../boot/dts/rockchip/rk3566-radxa-zero3.dts b/...oot/dts/rockchip/rk3566-radxa-zero-3w.dts → .../boot/dts/rockchip/rk3566-radxa-zero3.dts
@@ -18,8 +18,8 @@
 #include "rk3566.dtsi"
 
 / {
-	model = "Radxa Zero 3W";
-	compatible = "radxa,zero-3w", "rockchip,rk3566";
+	model = "Radxa ZERO 3";
+	compatible = "radxa,zero3", "rockchip,rk3566";
 
 	fiq_debugger: fiq-debugger {
 		compatible = "rockchip,fiq-debugger";