diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0d4ae6d03e16..102fa9e6b3ae 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1189,7 +1189,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rv1126b-evb2-v10-mcu-k350c4516t.dtb \ rv1126b-evb2-v10-rgb-Q7050ITH2641AA1T.dtb \ rv1126b-evb2-v10-sii9022-bt1120-to-hdmi.dtb \ - rv1126b-evb2-v10-tb-400w.dtb \ + rv1126b-evb2-v10-tb-400w-spi-nor.dtb \ rv1126b-evb3-v10.dtb \ rv1126b-evb4-v10.dtb \ rv1126b-iotest-v10.dtb \ diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10-tb-400w.dts b/arch/arm/boot/dts/rv1126b-evb2-v10-tb-400w-spi-nor.dts similarity index 79% rename from arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10-tb-400w.dts rename to arch/arm/boot/dts/rv1126b-evb2-v10-tb-400w-spi-nor.dts index c1ba05974b77..ad9c331b2226 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10-tb-400w.dts +++ b/arch/arm/boot/dts/rv1126b-evb2-v10-tb-400w-spi-nor.dts @@ -4,15 +4,15 @@ */ /dts-v1/; -#include "rv1126b.dtsi" -#include "rv1126b-evb.dtsi" -#include "rv1126b-evb2-v10.dtsi" +#include "arm64/rockchip/rv1126b.dtsi" +#include "arm64/rockchip/rv1126b-evb.dtsi" +#include "arm64/rockchip/rv1126b-evb2-v10.dtsi" #include "rv1126b-thunder-boot-cam.dtsi" #include "rv1126b-thunder-boot-spi-nor.dtsi" / { - model = "Rockchip RV1126B EVB2 V10 ARM64 TB 400W Board"; - compatible = "rockchip,rv1126b-evb2-v10-tb-400w", "rockchip,rv1126b"; + model = "Rockchip RV1126B EVB2 V10 TB 400W SPI NorFlash Board"; + compatible = "rockchip,rv1126b-evb2-v10-tb-400w-spi-nor", "rockchip,rv1126b"; chosen { bootargs = "loglevel=0 initcall_nr_threads=-1 initcall_debug=0 earlycon=uart8250,mmio32,0x20810000 console=ttyFIQ0 root=/dev/rd0 rootfstype=erofs rootflags=dax snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=32K"; @@ -28,7 +28,6 @@ sc450ai: sc450ai@30 { compatible = "smartsens,sc450ai"; - status = "okay"; reg = <0x30>; clocks = <&cru CLK_MIPI0_OUT2IO>; clock-names = "xvclk"; @@ -50,11 +49,11 @@ }; &ramdisk_r { - reg = <0x48c40000 (40 * 0x00100000)>; + reg = <0x48c40000 (30 * 0x00100000)>; }; &ramdisk_c { - reg = <0x4b440000 (20 * 0x00100000)>; + reg = <0x4aa40000 (20 * 0x00100000)>; }; &rkisp_thunderboot { diff --git a/arch/arm/boot/dts/rv1126b-evb2-v10-tb-400w.dts b/arch/arm/boot/dts/rv1126b-evb2-v10-tb-400w.dts deleted file mode 100644 index 5d1bfda82ece..000000000000 --- a/arch/arm/boot/dts/rv1126b-evb2-v10-tb-400w.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2025 Rockchip Electronics Co., Ltd. - */ - -#include "arm64/rockchip/rv1126b-evb2-v10-tb-400w.dts" - -/ { - model = "Rockchip RV1126B EVB2 V10 TB 400W Board"; - compatible = "rockchip,rv1126b-evb2-v10-tb-400w", "rockchip,rv1126b"; -}; - -&ramdisk_r { - reg = <0x48c40000 (30 * 0x00100000)>; -}; - -&ramdisk_c { - reg = <0x4aa40000 (20 * 0x00100000)>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot-cam.dtsi b/arch/arm/boot/dts/rv1126b-thunder-boot-cam.dtsi similarity index 100% rename from arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot-cam.dtsi rename to arch/arm/boot/dts/rv1126b-thunder-boot-cam.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot-emmc.dtsi b/arch/arm/boot/dts/rv1126b-thunder-boot-emmc.dtsi similarity index 100% rename from arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot-emmc.dtsi rename to arch/arm/boot/dts/rv1126b-thunder-boot-emmc.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot-spi-nor.dtsi b/arch/arm/boot/dts/rv1126b-thunder-boot-spi-nor.dtsi similarity index 100% rename from arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot-spi-nor.dtsi rename to arch/arm/boot/dts/rv1126b-thunder-boot-spi-nor.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot.dtsi b/arch/arm/boot/dts/rv1126b-thunder-boot.dtsi similarity index 98% rename from arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot.dtsi rename to arch/arm/boot/dts/rv1126b-thunder-boot.dtsi index 3c7d15df6207..b66d0d5f6d18 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-thunder-boot.dtsi +++ b/arch/arm/boot/dts/rv1126b-thunder-boot.dtsi @@ -116,7 +116,7 @@ }; rtos: rtos@48c00000 { - reg = <0x48c00000 0x0003a000>; + reg = <0x48c00000 0x0003c000>; }; mcu_log: mcu_log@48c3c000 {