diff options
author | Richard Zhu <hongxing.zhu@nxp.com> | 2021-07-12 16:49:42 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-02 16:51:04 +0800 |
commit | 9bfd8f73de67f2bd36026a093d24d3dcbb2b6c6b (patch) | |
tree | 91386341ff541c1ffdaf5ebca54881131fb333a4 | |
parent | 9ae41a6e8e147264354cc94381149692aedf54e3 (diff) |
LF-4134-2 arm64: dts: imx8m: 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>
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mm-ab2.dts | 11 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk-inmate.dts | 1 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts | 11 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mm.dtsi | 14 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts | 11 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts | 16 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts | 11 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn.dtsi | 14 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts | 11 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp.dtsi | 14 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mq-evk-rpmsg.dts | 22 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 11 | ||||
-rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mq.dtsi | 14 |
13 files changed, 0 insertions, 161 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-ab2.dts b/arch/arm64/boot/dts/freescale/imx8mm-ab2.dts index 7fb13d20ecdd..c4adf365fee8 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 de34a254b8c4..fe6961f39e21 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 f08682eb6432..53fe0cb91e44 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-rpmsg.dts @@ -108,17 +108,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 b7b688b52233..998ab80bcfd0 100755 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -1477,20 +1477,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 4dd4aa36431d..1ad3175669d4 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts +++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts @@ -116,17 +116,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"; -}; - &sai2 { 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 9f290e3d6a86..8d76d3cfceff 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; @@ -112,17 +107,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"; -}; - &sai2 { 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 7d0aace115a0..b5dc63bf1dd9 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts +++ b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts @@ -108,17 +108,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"; -}; - &sai2 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index c417d26a638f..caa491c3a795 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -1408,20 +1408,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 { #phy-cells = <0>; compatible = "usb-nop-xceiv"; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts index 661464988521..5b4aa5d91ec6 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts @@ -159,17 +159,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 ba2d44a6d46f..e9e48141b240 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -2215,20 +2215,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 9b6a5a617568..faf71eb1c03d 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 222df06f5bf7..2ea7507311af 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 af2b60a236f6..e647433cf62c 100755 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -1690,18 +1690,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"; - }; }; |