diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts index 235f232cff9c..50bd024528df 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "rk3568-nvr-demo-v10.dtsi" -#include "rk3568-linux.dtsi" +#include "rk3568-nvr-linux.dtsi" / { model = "Rockchip RK3568 NVR DEMO DDR4 V10 Linux SPI NAND Board"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts index d3e5a8bfa54a..3317db6ee671 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts @@ -7,7 +7,7 @@ /dts-v1/; #include "rk3568-nvr-demo-v10.dtsi" -#include "rk3568-linux.dtsi" +#include "rk3568-nvr-linux.dtsi" / { model = "Rockchip RK3568 NVR DEMO DDR4 V10 Linux Board"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts index 88cff39ba1d4..de8c1a1e734f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "rk3568-nvr-demo-v12.dtsi" -#include "rk3568-linux.dtsi" +#include "rk3568-nvr-linux.dtsi" / { model = "Rockchip RK3568 NVR DEMO DDR4 V12 Linux SPI NAND Board"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts index 996172e9d601..b605c3d57d26 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts @@ -7,7 +7,7 @@ /dts-v1/; #include "rk3568-nvr-demo-v12.dtsi" -#include "rk3568-linux.dtsi" +#include "rk3568-nvr-linux.dtsi" / { model = "Rockchip RK3568 NVR DEMO DDR4 V12 Linux Board"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi new file mode 100644 index 000000000000..f9908b61cb41 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. + * + */ + +/ { + chosen: chosen { + bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rw rootwait"; + }; + + fiq-debugger { + compatible = "rockchip,fiq-debugger"; + rockchip,serial-id = <2>; + rockchip,wake-irq = <0>; + /* If enable uart uses irq instead of fiq */ + rockchip,irq-mode-enable = <1>; + rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */ + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&uart2m0_xfer>; + status = "okay"; + }; + + debug: debug@fd904000 { + compatible = "rockchip,debug"; + reg = <0x0 0xfd904000 0x0 0x1000>, + <0x0 0xfd905000 0x0 0x1000>, + <0x0 0xfd906000 0x0 0x1000>, + <0x0 0xfd907000 0x0 0x1000>; + }; + + cspmu: cspmu@fd90c000 { + compatible = "rockchip,cspmu"; + reg = <0x0 0xfd90c000 0x0 0x1000>, + <0x0 0xfd90d000 0x0 0x1000>, + <0x0 0xfd90e000 0x0 0x1000>, + <0x0 0xfd90f000 0x0 0x1000>; + }; +}; + +&reserved_memory { + ramoops: ramoops@110000 { + compatible = "ramoops"; + reg = <0x0 0x110000 0x0 0xf0000>; + record-size = <0x20000>; + console-size = <0x80000>; + ftrace-size = <0x00000>; + pmsg-size = <0x50000>; + }; +}; + +&rng { + status = "okay"; +};