MLK-20776-1 ARM64: dts: refine the rpmsg dts

- Correct the rpmsg compatible property on imx8mm/mq.
- Move the rpmsg dts to the -m4 dts on imx8qm.

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

4 files changed, 11 insertions, 20 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
index 2108d061b7ba..e5ea8c011eee 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
@@ -587,7 +587,7 @@
 		};
 
 		rpmsg: rpmsg{
-			compatible = "fsl,imx8qm-rpmsg";
+			compatible = "fsl,imx8mq-rpmsg";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi
index 9e4d63792f8e..00f795c837a3 100755
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq.dtsi
@@ -1367,7 +1367,7 @@
 		ranges;
 
 		rpmsg: rpmsg{
-			compatible = "fsl,imx8qm-rpmsg";
+			compatible = "fsl,imx8mq-rpmsg";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-m4.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-m4.dts
index 3c2f6645ec23..5306c7e478dd 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-m4.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-m4.dts
@@ -80,6 +80,15 @@
 	status = "disabled";
 };
 
+&rpmsg{
+	/*
+	 * 64K for one rpmsg instance:
+	 */
+	vdev-nums = <2>;
+	reg = <0x0 0x90000000 0x0 0x20000>;
+	status = "okay";
+};
+
 &rpmsg1{
 	/*
 	 * 64K for one rpmsg instance, using 2 instance
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi
index 4b68b8262b50..08a319b0db30 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek.dtsi
@@ -1152,15 +1152,6 @@
 	status = "okay";
 };
 
-&rpmsg{
-	/*
-	 * 64K for one rpmsg instance:
-	 */
-	vdev-nums = <2>;
-	reg = <0x0 0x90000000 0x0 0x20000>;
-	status = "okay";
-};
-
 &pd_cm41_intmux {
 	early_power_on;
 };
@@ -1169,15 +1160,6 @@
 	status = "okay";
 };
 
-&rpmsg1{
-	/*
-	 * 64K for one rpmsg instance:
-	 */
-	vdev-nums = <2>;
-	reg = <0x0 0x90100000 0x0 0x20000>;
-	status = "okay";
-};
-
 &mipi_csi_0 {
 	#address-cells = <1>;
 	#size-cells = <0>;