From 570ffc5278f695ff94da4f9bc8da1c0a70343bcb Mon Sep 17 00:00:00 2001
From: Zain Wang <wzz@rock-chips.com>
Date: Fri, 23 Feb 2024 17:55:43 +0800
Subject: [PATCH] arm64: dts: rockchip: AMP memory use reserved-memory

Signed-off-by: Zain Wang <wzz@rock-chips.com>
Change-Id: I05d80fab58e047cc7bdac8ac34d1f541b556cb64
---
 .../rockchip/rk3562-evb1-lp4x-v10-linux-amp.dts   | 13 +++++++++----
 .../rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts   | 13 +++++++++----
 .../rockchip/rk3568-evb1-ddr4-v10-linux-amp.dts   | 13 +++++++++----
 .../rockchip/rk3588-evb1-lp4-v10-linux-amp.dts    | 15 +++++++++------
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10-linux-amp.dts
index d39eba9b3a96..a05e80c4304b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10-linux-amp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3562-evb1-lp4x-v10-linux-amp.dts
@@ -10,10 +10,15 @@
 #include "rk3562-amp.dtsi"
 
 / {
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x02000000 0x0 0x06400000>,
-		      <0x0 0x0a200000 0x0 0xf1e00000>;
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		amp_reserved: amp@800000 {
+			reg = <0x0 0x00800000 0x0 0x01800000>;
+			no-map;
+		};
 	};
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts
index 99385760cbed..97b855e9efb0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts
@@ -11,10 +11,15 @@
 #include "rk3562-amp.dtsi"
 
 / {
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x02000000 0x0 0x04b80000>,
-		      <0x0 0x0a200000 0x0 0x75e00000>;
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		amp_reserved: amp@800000 {
+			reg = <0x0 0x00800000 0x0 0x01800000>;
+			no-map;
+		};
 	};
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-amp.dts
index 0c1b2156261e..80889b7aebd3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-amp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-amp.dts
@@ -8,10 +8,15 @@
 #include "rk3568-amp.dtsi"
 
 / {
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x03880000 0x0 0x04b80000>,
-		      <0x0 0x0a200000 0x0 0x75e00000>;
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		amp_reserved: amp@1800000 {
+			reg = <0x0 0x01800000 0x0 0x01800000>;
+			no-map;
+		};
 	};
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4-v10-linux-amp.dts
index 23ec15727ec0..48c1d122b36b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4-v10-linux-amp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4-v10-linux-amp.dts
@@ -23,12 +23,15 @@
 		};
 	};
 
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x02000000 0x0 0x06400000>,
-		      <0x0 0x09400000 0x0 0xe6c00000>,
-		      <0x1 0x00000000 0x1 0x00000000>,
-		      <0x2 0xf0000000 0x0 0x10000000>;
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		amp_reserved: amp@800000 {
+			reg = <0x0 0x00800000 0x0 0x01800000>;
+			no-map;
+		};
 	};
 };