From c9dd6b483b56829fa67eadbe26ee488786d7a655 Mon Sep 17 00:00:00 2001 From: Weiwen Chen Date: Wed, 6 Jul 2022 15:03:16 +0800 Subject: [PATCH] ARM: dts: rockchip: rv1106-thunder-boot: reserved memory for meta Signed-off-by: Weiwen Chen Change-Id: I70266109c9644b849e0e42263a3c8490ee521680 --- arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts | 9 +++++++-- arch/arm/boot/dts/rv1106-thunder-boot.dtsi | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts b/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts index e29133f2ba60..17be41d78e39 100644 --- a/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts +++ b/arch/arm/boot/dts/rv1103g-battery-ipc-v10.dts @@ -46,7 +46,7 @@ }; chosen { - bootargs = "loglevel=0 console=ttyFIQ0 root=/dev/rd0 snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0 driver_async_probe=dwmmc_rockchip rk_dma_heap_cma=24M storagemedia=mtd androidboot.storagemedia=mtd androidboot.mode=normal mtdparts=sfc_nor:64K(env),256K@64K(idblock),256K(uboot),64K(vnvm),8M(boot),3M(userdata)"; + bootargs = "loglevel=0 console=ttyFIQ0 root=/dev/rd0 snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0 driver_async_probe=dwmmc_rockchip rk_dma_heap_cma=24M storagemedia=mtd androidboot.storagemedia=mtd androidboot.mode=normal"; }; acodec_sound: acodec-sound { @@ -189,6 +189,11 @@ reg = <0x00000000 0x04000000>; }; +&meta { + /* reserved meta partition 384KB */ + reg = <0x01e00000 (384 * 0x400)>; +}; + &mipi0_csi2 { status = "okay"; @@ -254,7 +259,7 @@ &rkisp_thunderboot { /* 6M for NV12 (w*h*1.5*2) w and h 16 align, 1920/1088 */ - reg = <0x01e00000 (6 * 0x00100000)>; + reg = <0x01e60000 (6 * 0x00100000)>; }; &rkisp_vir0 { diff --git a/arch/arm/boot/dts/rv1106-thunder-boot.dtsi b/arch/arm/boot/dts/rv1106-thunder-boot.dtsi index eda33bc0e049..e3a3333c430e 100644 --- a/arch/arm/boot/dts/rv1106-thunder-boot.dtsi +++ b/arch/arm/boot/dts/rv1106-thunder-boot.dtsi @@ -31,10 +31,14 @@ reg = <0x01900000 (5 * 0x00100000)>; }; - rkisp_thunderboot: rkisp@1e00000 { - /* NV12 (w*h*1.5*2) w and h 16 align, eg:1920x1088 */ + meta: meta@1e00000 { reg = <0x01e00000 0x0>; }; + + rkisp_thunderboot: rkisp@1e60000 { + /* NV12 (w*h*1.5*2) w and h 16 align, eg:1920x1088 */ + reg = <0x1e60000 0x0>; + }; }; thunder_boot_rkisp: thunder-boot-rkisp {