From 41407a36ac3f761bdd302fea8d7d645817c20e0d Mon Sep 17 00:00:00 2001
From: Weiwen Chen <cww@rock-chips.com>
Date: Tue, 6 Sep 2022 14:47:32 +0800
Subject: [PATCH] ARM: dts: rockchip: rv1106-thunder-boot: update memory layout

Because of the meta and rkisp_thunderboot memory offset MUST
match with RTOS, so move meta and rkisp_thunderboot to the
top of memory layout.

The memory layout for rv1106 thunder boot feature:

    SPL:       0 ~ 256KB
    RTOS:      256KB ~ 512KB
    SPL S & H: 512KB ~ (2MB - 8KB)
    ATAGS:     (2MB - 8KB) ~ 2MB
    UBOOT:     2MB ~
    KERNEL_R:  (2MB + 0x8000) ~ (8MB - 128KB)
    DTB:       (8MB - 128KB) ~ 8MB
    META:      8MB ~ (8MB + 384KB)
    ISP:       (8MB + 384KB) ~ (8MB + 384KB + ceil(w*10/8/256)*256*h*(buf_num))
    RAMDISK_R: 0x12ec000 ~ (0x12ec000 + 10MB)
    RAMDISK_C: (0x12ec000 + 10MB) ~ (0x12ec000 + 10MB + 5MB)
    KERNEL_C:  (0x12ec000 + 10MB + 5MB) ~ (0x12ec000 + 10MB + 5MB + 5MB)

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I9d18041559ca10c96f5d94a1c0dcf1d535c90db4
---
 arch/arm/boot/dts/rv1106-thunder-boot.dtsi | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/rv1106-thunder-boot.dtsi b/arch/arm/boot/dts/rv1106-thunder-boot.dtsi
index ecc9ac178d1b..df76f8fe8268 100644
--- a/arch/arm/boot/dts/rv1106-thunder-boot.dtsi
+++ b/arch/arm/boot/dts/rv1106-thunder-boot.dtsi
@@ -19,25 +19,30 @@
 		#size-cells = <1>;
 		ranges;
 
-		rtos@40000 {
+		rtos: rtos@40000 {
 			reg = <0x40000 0x40000>;
 		};
 
-		ramdisk_r: ramdisk@a00000 {
-			reg = <0x00a00000 (10 * 0x00100000)>;
+		meta: meta@800000 {
+			/* reg's offset MUST match with RTOS */
+			reg = <0x00800000 0x60000>;
 		};
 
-		ramdisk_c: ramdisk@1900000 {
-			reg = <0x01900000 (5 * 0x00100000)>;
+		rkisp_thunderboot: rkisp@860000 {
+			/* reg's offset MUST match with RTOS */
+			/*
+			 * vicap, capture raw10, ceil(w*10/8/256)*256*h *4(buf num)
+			 * e.g. 1920x1080: 0xa8c000
+			 */
+			reg = <0x00860000 0xa8c000>;
 		};
 
-		meta: meta@1e00000 {
-			reg = <0x01e00000 0x0>;
+		ramdisk_r: ramdisk_r {
+			reg = <0x12ec000 (10 * 0x00100000)>;
 		};
 
-		rkisp_thunderboot: rkisp@1e60000 {
-			/*  NV12 (w*h*1.5*2) w and h 16 align, eg:1920x1088 */
-			reg = <0x1e60000 0x0>;
+		ramdisk_c: ramdisk_c {
+			reg = <0x1cec000 (5 * 0x00100000)>;
 		};
 	};