From c6381262c426e48575a5dd54eaa1912c14c968ff Mon Sep 17 00:00:00 2001
From: Yifan Xu <nekorouter@outlook.com>
Date: Tue, 10 Dec 2024 18:08:15 +0800
Subject: [PATCH] remove dts "audio_mem" node and add mbox 910r channel

1: remove "audio_mem" node,
   because "audio_text_mem","audio_data_mem" and "audio_log_mem" cover it
2: add "mbox_910r" node,it will be used in opensbi to info 902

Signed-off-by: Yifan Xu <nekorouter@outlook.com>
---
 .../boot/dts/thead/th1520-lichee-pi-4a.dts     |  3 ---
 arch/riscv/boot/dts/thead/th1520.dtsi          | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts b/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts
index 3e18e885a33da..9b665bffde8b2 100644
--- a/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts
+++ b/arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts
@@ -740,9 +740,6 @@
         reg = <0x0 0x33400000 0x0 0x200000>;
 	};
 	//Note: with "no-map" reserv mem not saved in hibernation
-    audio_mem: memory@32000000 {
-		reg = <0x0 0x32000000 0x0 0x6400000>;
-    };
 	rpmsgmem: memory@1E000000 {
 		reg = <0x0 0x1E000000 0x0 0x10000>;
 	};
diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi
index 966b9b9ca0bb2..7d3fe4e90bfdb 100644
--- a/arch/riscv/boot/dts/thead/th1520.dtsi
+++ b/arch/riscv/boot/dts/thead/th1520.dtsi
@@ -330,6 +330,7 @@
 		compatible = "xuantie,th1520-aon";
 		mbox-names = "aon";
 		mboxes = <&mbox_910t 1 0>;
+		opensbi-mboxes = <&mbox_910r>;
 		status = "okay";
 
 		pd: th1520-aon-pd {
@@ -1196,6 +1197,23 @@
 			#mbox-cells = <2>;
 		};
 
+		mbox_910r: mbox@ffefc53000 {
+			compatible = "xuantie,th1520-mbox-r";
+			reg = <0xff 0xefc53000 0x0 0x4000>,
+			      <0xff 0xefc3f000 0x0 0x1000>,
+			      <0xff 0xefc47000 0x0 0x1000>,
+			      <0xff 0xefc4f000 0x0 0x1000>;
+			reg-names = "local_base",
+				    "remote_icu0",
+				    "remote_icu1",
+				    "remote_icu2";
+			interrupt-controller;
+			clocks = <&apb_clk>;
+			clock-names = "ipg";
+			icu_cpu_id = <3>;
+			#mbox-cells = <2>;
+		};
+
 		adc: adc@0xfffff51000 {
 			compatible = "xuantie,th1520-adc";
 			reg = <0xff 0xfff51000 0x0 0x1000>;