arm: dts: add the rpmsg into the dts file

- Mailbox is used in the RPMSG implementation.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>

4 files changed, 62 insertions, 12 deletions

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 0d0b8577a530..08e43e0eda3e 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1365,12 +1365,7 @@
 				compatible = "fsl,imx6sx-mu";
 				reg = <0x02294000 0x4000>;
 				interrupts = <0 90 0x04>;
-				status = "okay";
-			};
-
-			rpmsg: rpmsg{
-				compatible = "fsl,imx6sx-rpmsg";
-				status = "disabled";
+				#mbox-cells = <2>;
 			};
 
 			uart6: serial@22a0000 {
@@ -1456,4 +1451,18 @@
 			status = "disabled";
 		};
 	};
+
+	rpmsg: rpmsg{
+		compatible = "fsl,imx6sx-rpmsg";
+		/* up to now, the following channels are used in imx rpmsg
+		 * - tx1/rx1: messages channel.
+		 * - general interrupt1: remote proc finish re-init rpmsg stack
+		 *   when A core is partition reset.
+		 */
+		mbox-names = "tx", "rx", "rxdb";
+		mboxes = <&mu 0 1
+			  &mu 1 1
+			  &mu 3 1>;
+		status = "disabled";
+	};
 };
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 784e5273f63a..55a1ee39a0d2 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -181,12 +181,7 @@
 		interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&clks IMX7D_MU_ROOT_CLK>;
 		clock-names = "mu";
-		status = "okay";
-	};
-
-	rpmsg: rpmsg{
-		compatible = "fsl,imx7d-rpmsg";
-		status = "disabled";
+		#mbox-cells = <2>;
 	};
 
 	sema4: sema4@30ac0000 {
@@ -294,6 +289,20 @@
 		fsl,imx7d-pcie-phy = <&pcie_phy>;
 		status = "disabled";
 	};
+
+	rpmsg: rpmsg{
+		compatible = "fsl,imx7d-rpmsg";
+		/* up to now, the following channels are used in imx rpmsg
+		 * - tx1/rx1: messages channel.
+		 * - general interrupt1: remote proc finish re-init rpmsg stack
+		 *   when A core is partition reset.
+		 */
+		mbox-names = "tx", "rx", "rxdb";
+		mboxes = <&mu 0 1
+			  &mu 1 1
+			  &mu 3 1>;
+		status = "disabled";
+	};
 };
 
 &ca_funnel_in_ports {
diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts
index 4245b33bb451..4aa3c5391c8a 100644
--- a/arch/arm/boot/dts/imx7ulp-evk.dts
+++ b/arch/arm/boot/dts/imx7ulp-evk.dts
@@ -59,6 +59,17 @@
 	status = "okay";
 };
 
+&rpmsg{
+	/*
+	 * 64K for one rpmsg instance, default using 2 rpmsg instances:
+	 * --0x9FF00000~0x9FF0FFFF: pmic,pm,audio,keys,gpio,sensor
+	 * --0x9FF10000~0x9FF1FFFF: pingpong,virtual tty
+	 */
+	vdev-nums = <2>;
+	reg = <0x9FF00000 0x20000>;
+	status = "okay";
+};
+
 &tpm4 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm0>;
diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi
index 6859a3a83750..cd2740227761 100644
--- a/arch/arm/boot/dts/imx7ulp.dtsi
+++ b/arch/arm/boot/dts/imx7ulp.dtsi
@@ -129,6 +129,13 @@
 				 <&pcc2 IMX7ULP_CLK_DMA_MUX1>;
 		};
 
+		mu: mu@40220000 {
+			compatible = "fsl,imx7ulp-mu", "fsl,imx6sx-mu";
+			reg = <0x40220000 0x1000>;
+			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+			#mbox-cells = <2>;
+		};
+
 		crypto: crypto@40240000 {
 			compatible = "fsl,sec-v4.0";
 			#address-cells = <1>;
@@ -461,4 +468,18 @@
 			clocks = <&scg1 IMX7ULP_CLK_DUMMY>;
 		};
 	};
+
+	rpmsg: rpmsg{
+		compatible = "fsl,imx7ulp-rpmsg";
+		/* up to now, the following channels are used in imx rpmsg
+		 * - tx1/rx1: messages channel.
+		 * - general interrupt1: remote proc finish re-init rpmsg stack
+		 *   when A core is partition reset.
+		 */
+		mbox-names = "tx", "rx", "rxdb";
+		mboxes = <&mu 0 1
+			  &mu 1 1
+			  &mu 3 1>;
+		status = "disabled";
+	};
 };