From aa414c3cbb0d5ee4610a20d3b79bed7a3f01c5ec Mon Sep 17 00:00:00 2001
From: Richard Zhu <hongxing.zhu@nxp.com>
Date: Fri, 2 Jul 2021 13:53:38 +0800
Subject: [PATCH] LF-4134-2 arm64: dts: remove the local rpmsg support
Since the i.MX8 RPMSG support had been switched to remote proc.
To clean up the codes, remove the local i.MX RPMSG supports.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
---
.../dts/freescale/imx8dxl-ddr3-evk-rpmsg.dts | 10 ----
.../boot/dts/freescale/imx8dxl-ddr3-evk.dts | 5 --
.../boot/dts/freescale/imx8dxl-evk-rpmsg.dts | 10 ----
arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 5 --
.../dts/freescale/imx8dxl-phantom-mek.dtsi | 58 -------------------
arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 15 -----
arch/arm64/boot/dts/freescale/imx8mm-ab2.dts | 11 ----
.../dts/freescale/imx8mm-ddr4-evk-inmate.dts | 1 -
.../boot/dts/freescale/imx8mm-evk-rpmsg.dts | 11 ----
arch/arm64/boot/dts/freescale/imx8mm.dtsi | 14 -----
.../dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts | 11 ----
.../dts/freescale/imx8mn-ddr4-evk-rpmsg.dts | 16 -----
.../boot/dts/freescale/imx8mn-evk-rpmsg.dts | 11 ----
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 14 -----
.../boot/dts/freescale/imx8mp-evk-rpmsg.dts | 11 ----
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 14 -----
.../boot/dts/freescale/imx8mq-evk-rpmsg.dts | 22 -------
arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 11 ----
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 14 -----
arch/arm64/boot/dts/freescale/imx8q-val.dtsi | 9 ---
.../dts/freescale/imx8qm-cockpit-ca53.dtsi | 30 ----------
.../dts/freescale/imx8qm-cockpit-ca72.dtsi | 30 ----------
.../boot/dts/freescale/imx8qm-ddr4-val.dts | 18 ------
.../boot/dts/freescale/imx8qm-lpddr4-val.dts | 11 ----
.../dts/freescale/imx8qm-mek-cockpit-a53.dts | 30 ----------
.../dts/freescale/imx8qm-mek-cockpit-a72.dts | 30 ----------
.../boot/dts/freescale/imx8qm-mek-dom0.dts | 5 --
.../boot/dts/freescale/imx8qm-mek-domu.dts | 7 ---
arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 24 --------
arch/arm64/boot/dts/freescale/imx8qm.dtsi | 30 ----------
.../boot/dts/freescale/imx8qxp-lpddr4-val.dts | 11 ----
arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 15 -----
arch/arm64/boot/dts/freescale/imx8x-mek.dtsi | 15 -----
arch/arm64/boot/dts/freescale/imx8x-val.dtsi | 9 ---
34 files changed, 538 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk-rpmsg.dts
index c6a7d016fbbc06..242e2c795ccfed 100644
--- a/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk-rpmsg.dts
@@ -7,16 +7,6 @@
#include "imx8dxl-ddr3-evk.dts"
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&imx8dxl_cm4 {
/* Assume you have partitioned M4, so M4 is not controled by Linux */
/delete-property/ power-domains;
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk.dts b/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk.dts
index 28d7afca870a89..7811762e375f51 100644
--- a/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-ddr3-evk.dts
@@ -35,11 +35,6 @@
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90200000 0 0x200000>;
- };
-
vdev0vring0: vdev0vring0@90000000 {
compatible = "shared-dma-pool";
reg = <0 0x90000000 0 0x8000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8dxl-evk-rpmsg.dts
index 93f657e264998b..dcfc76276d5b54 100644
--- a/arch/arm64/boot/dts/freescale/imx8dxl-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-evk-rpmsg.dts
@@ -7,16 +7,6 @@
#include "imx8dxl-evk.dts"
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&imx8dxl_cm4 {
/* Assume you have partitioned M4, so M4 is ont controled by Linux */
/delete-property/ power-domains;
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-evk.dts b/arch/arm64/boot/dts/freescale/imx8dxl-evk.dts
index 819213e232c188..577b82c9e5ec51 100644
--- a/arch/arm64/boot/dts/freescale/imx8dxl-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-evk.dts
@@ -35,11 +35,6 @@
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90200000 {
- no-map;
- reg = <0 0x90200000 0 0x200000>;
- };
-
/*
* Memory reserved for optee usage. Please do not use.
* This will be automaticky added to dtb if OP-TEE is installed.
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi
index 09aa83d6a88c86..f1a1e4e6058d69 100755
--- a/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-phantom-mek.dtsi
@@ -17,33 +17,6 @@
stdout-path = &lpuart0;
};
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
-
- /*
- * 0x8800_0000 ~ 0x8FFF_FFFF is reserved for M4
- * Shouldn't be used at A core and Linux side.
- *
- */
- m4_reserved: m4@0x88000000 {
- no-map;
- reg = <0 0x88000000 0 0x8000000>;
- };
-
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
-
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
- };
-
modem_reset: modem-reset {
compatible = "gpio-reset";
pinctrl-names = "default", "sleep";
@@ -69,17 +42,6 @@
no-map;
reg = <0 0x88000000 0 0x8000000>;
};
-
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
-
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
};
regulators {
@@ -205,16 +167,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&rpmsg_dma_reserved>;
- status = "okay";
-};
-
&acm {
status = "okay";
};
@@ -710,13 +662,3 @@
ext_osc = <1>;
status = "okay";
};
-
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&rpmsg_dma_reserved>;
- status = "okay";
-};
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl.dtsi b/arch/arm64/boot/dts/freescale/imx8dxl.dtsi
index ccaa04e59d5a55..5ddc9f2c50a453 100644
--- a/arch/arm64/boot/dts/freescale/imx8dxl.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8dxl.dtsi
@@ -103,21 +103,6 @@
};
};
- rpmsg: rpmsg{
- compatible = "fsl,imx8qxp-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 = <&lsio_mu5 0 1
- &lsio_mu5 1 1
- &lsio_mu5 3 1>;
- mub-partition = <3>;
- status = "disabled";
- };
-
imx8dxl_cm4: imx8dxl_cm4@0 {
compatible = "fsl,imx8qxp-cm4";
rsc-da = <0x90000000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-ab2.dts b/arch/arm64/boot/dts/freescale/imx8mm-ab2.dts
index 3f5cf6cea88d7c..b8cd5d5d5a30b5 100755
--- a/arch/arm64/boot/dts/freescale/imx8mm-ab2.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-ab2.dts
@@ -12,17 +12,6 @@
model = "FSL i.MX8MM Audio board 2.0";
compatible = "fsl,imx8mm-ab2", "fsl,imx8mm";
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
-
- rpmsg_reserved: rpmsg@0xb8000000 {
- no-map;
- reg = <0 0xb8000000 0 0x400000>;
- };
- };
-
chosen {
stdout-path = &uart2;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk-inmate.dts b/arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk-inmate.dts
index de34a254b8c419..fe6961f39e2146 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk-inmate.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk-inmate.dts
@@ -153,7 +153,6 @@
/delete-node/ &system_counter;
-/delete-node/ &rpmsg;
&ocotp {
/delete-property/ compatible;
status = "disabled";
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts
index cc50ee23ff4b90..0a0d4dda6b1957 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts
@@ -110,17 +110,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- * --0xb8000000~0xb800ffff: pingpong
- */
- vdev-nums = <1>;
- reg = <0x0 0xb8000000 0x0 0x10000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&uart4 {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
index d6028827418924..d2c2b96cba5b3a 100755
--- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -1455,20 +1455,6 @@
};
};
- rpmsg: rpmsg{
- compatible = "fsl,imx8mq-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";
- };
-
vpu_h1: vpu_h1@38320000 {
compatible = "nxp,imx8mm-hantro-h1";
reg = <0x0 0x38320000 0x0 0x10000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
index 57a56f638fb568..6def5f1eff82e7 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
@@ -110,17 +110,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- * --0xb8000000~0xb800ffff: pingpong
- */
- vdev-nums = <1>;
- reg = <0x0 0xb8000000 0x0 0x10000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&sai3 {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
index 7d47284216329c..373a2dad18de80 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
@@ -16,11 +16,6 @@
reg = <0 0x80000000 0 0x1000000>;
};
- rpmsg_reserved: rpmsg@0xb8200000 {
- no-map;
- reg = <0 0xb8200000 0 0x200000>;
- };
-
vdev0vring0: vdev0vring0@b8000000 {
reg = <0 0xb8000000 0 0x8000>;
no-map;
@@ -110,17 +105,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- * --0xb8000000~0xb800ffff: pingpong
- */
- vdev-nums = <1>;
- reg = <0x0 0xb8000000 0x0 0x10000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&sai3 {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
index 8b25dd661884d4..818a47cb3a5af0 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
@@ -106,17 +106,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- * --0xb8000000~0xb800ffff: pingpong
- */
- vdev-nums = <1>;
- reg = <0x0 0xb8000000 0x0 0x10000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&sai3 {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index 45543fb36ca642..9fd40f8e2b7ad3 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -1397,20 +1397,6 @@
status = "disabled";
};
- rpmsg: rpmsg{
- compatible = "fsl,imx8mq-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";
- };
-
usbphynop1: usbphynop1 {
compatible = "usb-nop-xceiv";
clocks = <&clk IMX8MN_CLK_USB_PHY_REF>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts
index b9656b02f20fce..8cf9c8f025a282 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts
@@ -166,17 +166,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- * --0x55000000~0x5500ffff: pingpong
- */
- vdev-nums = <1>;
- reg = <0x0 0x55000000 0x0 0x10000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&sai3 {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 475cd912a7a7e0..61c679c9aa9de5 100755
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -2183,20 +2183,6 @@
};
};
- rpmsg: rpmsg{
- compatible = "fsl,imx8mq-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";
- };
-
vpu_g1: vpu_g1@38300000 {
compatible = "nxp,imx8mm-hantro","nxp,imx8mp-hantro";
reg = <0x0 0x38300000 0x0 0x100000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-rpmsg.dts
index fdfddcdbe87290..9fb147927708dd 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-rpmsg.dts
@@ -18,17 +18,6 @@
reg = <0 0x80000000 0 0x1000000>;
};
- rpmsg_reserved: rpmsg@0xb8000000 {
- no-map;
- reg = <0 0xb8000000 0 0x400000>;
- };
-
- rpmsg_dma_reserved:rpmsg_dma@0xb8400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0xb8400000 0 0x100000>;
- };
-
rsc_table: rsc_table@b8000000 {
reg = <0 0xb8000000 0 0x8000>;
no-map;
@@ -83,17 +72,6 @@
status = "disabled";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- * --0xb8000000~0xb800ffff: pingpong
- */
- vdev-nums = <1>;
- reg = <0x0 0xb8000000 0x0 0x10000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&tmu {
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
index 2b2d9d9863540e..ea55a371d8e038 100755
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
@@ -22,17 +22,6 @@
reg = <0x00000000 0x40000000 0 0xc0000000>;
};
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
-
- rpmsg_reserved: rpmsg@0xb8000000 {
- no-map;
- reg = <0 0xb8000000 0 0x400000>;
- };
- };
-
modem_reset: modem-reset {
compatible = "gpio-reset";
reset-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index ab73a7ac399495..9f15c03b31d42b 100755
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1645,18 +1645,4 @@
power-domains = <&pgc_gpu>;
status = "disabled";
};
-
- rpmsg: rpmsg{
- compatible = "fsl,imx8mq-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/arm64/boot/dts/freescale/imx8q-val.dtsi b/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
index bdf689ed58fddf..67ad96bbb4e04a 100644
--- a/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
@@ -52,15 +52,6 @@
no-map;
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
decoder_rpc: decoder_rpc@0x92000000 {
no-map;
reg = <0 0x92000000 0 0x200000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca53.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca53.dtsi
index 8e9c7eab3698c0..76068403ad6199 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca53.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca53.dtsi
@@ -330,36 +330,6 @@
};
};
- rpmsg0: rpmsg0{
- compatible = "fsl,imx8qm-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 = <&lsio_mu5 0 1
- &lsio_mu5 1 1
- &lsio_mu5 3 1>;
- mub-partition = <5>;
- status = "disabled";
- };
-
- rpmsg1: rpmsg1{
- compatible = "fsl,imx8qm-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 = <&lsio_mu6 0 1
- &lsio_mu6 1 1
- &lsio_mu6 3 1>;
- mub-partition = <6>;
- status = "disabled";
- };
-
imx_shmem_net: imx_shmem_net {
compatible = "fsl,imx-shmem-net";
mub-partition = <3>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca72.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca72.dtsi
index b716f5b5d06cb2..2dd86e1d5931c0 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca72.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-cockpit-ca72.dtsi
@@ -302,36 +302,6 @@
};
};
- rpmsg0: rpmsg0{
- compatible = "fsl,imx8qm-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 = <&lsio_mu5 0 1
- &lsio_mu5 1 1
- &lsio_mu5 3 1>;
- mub-partition = <3>;
- status = "disabled";
- };
-
- rpmsg1: rpmsg1{
- compatible = "fsl,imx8qm-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 = <&lsio_mu6 0 1
- &lsio_mu6 1 1
- &lsio_mu6 3 1>;
- mub-partition = <4>;
- status = "disabled";
- };
-
imx_shmem_net: imx_shmem_net {
compatible = "fsl,imx-shmem-net";
mub-partition = <1>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ddr4-val.dts b/arch/arm64/boot/dts/freescale/imx8qm-ddr4-val.dts
index 06c2754264a4b7..80757c11938e40 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ddr4-val.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ddr4-val.dts
@@ -66,15 +66,6 @@
no-map;
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
decoder_rpc: decoder_rpc@0x92000000 {
no-map;
reg = <0 0x92000000 0 0x200000>;
@@ -771,15 +762,6 @@
status = "okay";
};
-&rpmsg1{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <1>;
- reg = <0x0 0x90100000 0x0 0x10000>;
- status = "okay";
-};
-
&ldb1_phy {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts b/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts
index f932faf114b6e5..a3518b9997ef58 100755
--- a/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts
@@ -42,17 +42,6 @@
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
-
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
-
decoder_rpc: decoder_rpc@0x92000000 {
no-map;
reg = <0 0x92000000 0 0x200000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts
index 8a269c0ec1b280..6c44d819fbb322 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts
@@ -116,15 +116,6 @@
no-map;
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
shmem_dma_reserved:shmem_dma@0x92000000 {
compatible = "shared-dma-pool";
no-map;
@@ -883,30 +874,9 @@
disable-gpio = <&lsio_gpio4 9 GPIO_ACTIVE_LOW>;
ext_osc = <1>;
epdev_on-supply = <&epdev_on>;
- reserved-region = <&rpmsg_reserved>;
status = "disabled";
};
-&rpmsg0{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&rpmsg_dma_reserved>;
- status = "okay";
-};
-
-&rpmsg1{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90100000 0x0 0x20000>;
- memory-region = <&rpmsg_dma_reserved>;
- status = "okay";
-};
-
&imx_shmem_net {
memory-region = <&shmem_dma_reserved>;
status = "okay";
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts
index 1a4cd3d95dfb62..320f0a57f5433b 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts
@@ -116,15 +116,6 @@
no-map;
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
shmem_dma_reserved:shmem_dma@0x92000000 {
compatible = "shared-dma-pool";
no-map;
@@ -922,7 +913,6 @@
disable-gpio = <&lsio_gpio4 9 GPIO_ACTIVE_LOW>;
ext_osc = <1>;
epdev_on-supply = <&epdev_on>;
- reserved-region = <&rpmsg_reserved>;
status = "disabled";
};
@@ -946,26 +936,6 @@
status = "okay";
};
-&rpmsg0{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&rpmsg_dma_reserved>;
- status = "disabled";
-};
-
-&rpmsg1{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90100000 0x0 0x20000>;
- memory-region = <&rpmsg_dma_reserved>;
- status = "disabled";
-};
-
&imx_shmem_net {
memory-region = <&shmem_dma_reserved>;
rxfirst;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-dom0.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-dom0.dts
index a889fecca1378d..0e4e12276b6acb 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-dom0.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-dom0.dts
@@ -346,11 +346,6 @@
reg = <0 0x88000000 0 0x8000000>;
xen,passthrough;
};
- rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90200000 0 0x200000>;
- xen,passthrough;
- };
decoder_rpc@0x92000000 {
no-map;
reg = <0 0x92000000 0 0x200000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
index f7f36dc0d131e1..9a6857bf0c1800 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
@@ -101,7 +101,6 @@
* The reserved memory will be used when using U-Boot loading android
* image. For booting kernel using xl tool, pass args:
* cma=960M@2400M-3584M
- * For the rpmsg_reserved area, need xl tool to create for non-android.
*/
reserved-memory {
#address-cells = <2>;
@@ -138,11 +137,6 @@
reg = <0 0x95000000 0 0x400000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90200000 0 0x200000>;
- };
-
/* global autoconfigured region for contiguous allocations */
linux,cma {
compatible = "shared-dma-pool";
@@ -1150,7 +1144,6 @@
disable-gpio = <&lsio_gpio4 9 GPIO_ACTIVE_LOW>;
ext_osc = <1>;
epdev_on-supply = <&epdev_on>;
- reserved-region = <&rpmsg_reserved>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
index 2b49c8cab42199..5cb684a825e3b7 100755
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
@@ -120,10 +120,6 @@
no-map;
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90200000 0 0x200000>;
- };
decoder_rpc: decoder_rpc@0x92000000 {
no-map;
reg = <0 0x92000000 0 0x200000>;
@@ -1018,26 +1014,6 @@
status = "okay";
};
-&rpmsg0{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
-&rpmsg1{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90100000 0x0 0x20000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&sata {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sata>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm.dtsi b/arch/arm64/boot/dts/freescale/imx8qm.dtsi
index 1bd6a06308f3e9..c3a9034f6ba62a 100755
--- a/arch/arm64/boot/dts/freescale/imx8qm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm.dtsi
@@ -466,36 +466,6 @@
};
};
- rpmsg0: rpmsg0{
- compatible = "fsl,imx8qm-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 = <&lsio_mu5 0 1
- &lsio_mu5 1 1
- &lsio_mu5 3 1>;
- mub-partition = <3>;
- status = "disabled";
- };
-
- rpmsg1: rpmsg1{
- compatible = "fsl,imx8qm-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 = <&lsio_mu6 0 1
- &lsio_mu6 1 1
- &lsio_mu6 3 1>;
- mub-partition = <4>;
- status = "disabled";
- };
-
sc_pwrkey: sc-powerkey {
compatible = "fsl,imx8-pwrkey";
linux,keycode = <KEY_POWER>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts b/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts
index 3cdcd0576d675f..1380a14b49d0fc 100755
--- a/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-lpddr4-val.dts
@@ -31,17 +31,6 @@
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90000000 0 0x400000>;
- };
-
- rpmsg_dma_reserved:rpmsg_dma@0x90400000 {
- compatible = "shared-dma-pool";
- no-map;
- reg = <0 0x90400000 0 0x100000>;
- };
-
decoder_boot: decoder-boot@84000000 {
reg = <0 0x84000000 0 0x2000000>;
no-map;
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
index e65cdcba4f77c2..ce2c4f35455967 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
@@ -311,21 +311,6 @@
fsl,heap-id = <0>;
};
- rpmsg: rpmsg{
- compatible = "fsl,imx8qxp-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 = <&lsio_mu5 0 1
- &lsio_mu5 1 1
- &lsio_mu5 3 1>;
- mub-partition = <3>;
- status = "disabled";
- };
-
sc_pwrkey: sc-powerkey {
compatible = "fsl,imx8-pwrkey";
linux,keycode = <KEY_POWER>;
diff --git a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
index e7f348c2ad148a..ee5af3a5512e73 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
@@ -96,11 +96,6 @@
reg = <0 0x88000000 0 0x8000000>;
};
- rpmsg_reserved: rpmsg@0x90000000 {
- no-map;
- reg = <0 0x90200000 0 0x200000>;
- };
-
decoder_boot: decoder-boot@84000000 {
reg = <0 0x84000000 0 0x2000000>;
no-map;
@@ -992,16 +987,6 @@
status = "okay";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <2>;
- reg = <0x0 0x90000000 0x0 0x20000>;
- memory-region = <&vdevbuffer>;
- status = "disabled";
-};
-
&usbphy1 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8x-val.dtsi b/arch/arm64/boot/dts/freescale/imx8x-val.dtsi
index 37367823b806be..244a02504e3d31 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-val.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-val.dtsi
@@ -743,15 +743,6 @@
status = "okay";
};
-&rpmsg{
- /*
- * 64K for one rpmsg instance:
- */
- vdev-nums = <1>;
- reg = <0x0 0x90000000 0x0 0x10000>;
- status = "okay";
-};
-
&ldb1_phy {
status = "okay";
};
--
GitLab