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 c6a7d016fbbc061e12ee4a91823c4fc04308b585..242e2c795ccfed1935770e2ca8cd35b0b6daae62 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 28d7afca870a89c697b0648f6067281a8c116633..7811762e375f51c391b681d2da997da5b7484b7d 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 93f657e264998b81465e1d47da15bccdf8870f12..dcfc76276d5b5433b6cd73caa1e92ba37e6bd522 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 819213e232c1889305db0341c7fc1704bb3616cd..577b82c9e5ec51ea7bb2e27db70538650063511e 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 09aa83d6a88c86c14ac0fffeb287b98e1bb16036..f1a1e4e6058d69d41f909c80b8a8201c84f4575f 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 ccaa04e59d5a558f61e1f75a18393eb07ac6b014..5ddc9f2c50a4530c58bdf12fc8d30305f70edf77 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 3f5cf6cea88d7c116376a0560396615524b95736..b8cd5d5d5a30b5499011ff4708ace870db7e0164 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 de34a254b8c4199761eba447a6fec579a3bb8547..fe6961f39e2146ff58f98ab4a7239f728e574cf5 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 cc50ee23ff4b90db1c6bf04164ccc9c312f1d997..0a0d4dda6b19577803d7afe9303123a4b4b1a1d3 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 d60288274189241f91cef0f91edff398ca6afd39..d2c2b96cba5b3af1665718714c92eefa6fa271a0 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 57a56f638fb568fb9c357500cbed0d32ace9ee87..6def5f1eff82e709db6b9348abc19bdf854f377c 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 7d47284216329cabe41cabab1173a8c5dcc61212..373a2dad18de80529a332c3ce5a5ecf6141ffa01 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 8b25dd661884d44c7dba22381729cd3a2773bc6c..818a47cb3a5af0cba0a7568fc0c97703f48f0a65 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 45543fb36ca64295f1318d7686c721e83921045a..9fd40f8e2b7ad3c459b19e6c70badb22da1f3d5a 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 b9656b02f20fcea1e5fd1a9a339e01c72ca63996..8cf9c8f025a28232290f315bea95985281eb31e1 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 475cd912a7a7e0ee6ca10d7ec1dcdf641e02e367..61c679c9aa9de5572c2517195428bec2bbc495ea 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 fdfddcdbe8729097ebfef2cbd6e7f4d92757bd6d..9fb147927708dd6967b6693c1fc4edebb4e0f987 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 2b2d9d9863540e679908123bff48df021da8d188..ea55a371d8e038af7c9fc986febbbc07fcfb80ae 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 ab73a7ac399495b256c6d1e20bdfb0187cf8c209..9f15c03b31d42bd68391719abc0450663672f127 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 bdf689ed58fddf888d2220486cec8eb31d126a78..67ad96bbb4e04a7890c6b6da6294884851ccd6f4 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 8e9c7eab3698c008b7d451545c4bd75ae7a02e70..76068403ad6199c07df5e7fa8f8bf464c9419155 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 b716f5b5d06cb237193b225cd6c5eee3b793323b..2dd86e1d5931c06812cb49ce853f4fccfbfe3d4b 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 06c2754264a4b75152b7cd2fb31a93c2c5777301..80757c11938e40041a180f57bd1de1e2c4913925 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 f932faf114b6e55edf6bf4a84c66db0dca39efd7..a3518b9997ef58aa9025949383a9813043cc69d4 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 8a269c0ec1b280949d159b68aea8eaee1a3cfd90..6c44d819fbb322be07ce7bdbbe87968b382bc948 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 1a4cd3d95dfb62ccd38717ee3e9e8dae38feab01..320f0a57f5433ba4e7ff066f13ace93829796578 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 a889fecca1378dfdf468a8bc564ada078193bd82..0e4e12276b6acba3a8349d3556a292df51cfe295 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 f7f36dc0d131e112df7e5f37cd1311aeeb408eed..9a6857bf0c180023dbf9aae2725429b76560f997 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 2b49c8cab42199309763a26122a7dcc25000d7c5..5cb684a825e3b797a8b979f800b2b8669b057ddc 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 1bd6a06308f3e9e2b8c25cd5cffe80e3c144ab5b..c3a9034f6ba62ac2582e86f27317cb265fe16bad 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 3cdcd0576d675f09c268415ae9bf8b5a606ea3e9..1380a14b49d0fcc22289f5b40ca51d574a0e885f 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 e65cdcba4f77c2c1a60bbf0a0debd7e7ccc28c49..ce2c4f3545596772aeb8d14ecc9aab21a79fd187 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 e7f348c2ad148a121e79164a0c1e2aa0e480ead5..ee5af3a5512e734cac54c7324b5123038527bff5 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 37367823b806be934c156dd5354ba374ec28e922..244a02504e3d3138aeda683c13420e7b1200c6de 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"; };