From: Laurentiu Mihalcea <[email protected]> The CM7 remoteproc configuration is common to multiple MX95-based platforms (e.g. MX95-19x19-EVK, MX95-15x15-FRDM, SMARC-IMX95, etc.). Therefore, move the node to the MX95 SoC DTSI. While at it, split the mbox channels using <>.
Signed-off-by: Laurentiu Mihalcea <[email protected]> --- .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 14 ++++++-------- arch/arm64/boot/dts/freescale/imx95.dtsi | 7 +++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx95-toradex-smarc.dtsi b/arch/arm64/boot/dts/freescale/imx95-toradex-smarc.dtsi index 7d760470201f..c94a63a3bf8f 100644 --- a/arch/arm64/boot/dts/freescale/imx95-toradex-smarc.dtsi +++ b/arch/arm64/boot/dts/freescale/imx95-toradex-smarc.dtsi @@ -145,14 +145,6 @@ reg_wifi_en: regulator-wifi-en { startup-delay-us = <2000>; }; - remoteproc-cm7 { - compatible = "fsl,imx95-cm7"; - mboxes = <&mu7 0 1 &mu7 1 1 &mu7 3 1>; - mbox-names = "tx", "rx", "rxdb"; - memory-region = <&vdevbuffer>, <&vdev0vring0>, <&vdev0vring1>, - <&vdev1vring0>, <&vdev1vring1>, <&rsc_table>, <&m7_reserved>; - }; - reserved-memory { #address-cells = <2>; #size-cells = <2>; @@ -204,6 +196,12 @@ vdevbuffer: vdevbuffer@88020000 { }; }; +&cm7 { + memory-region = <&vdevbuffer>, <&vdev0vring0>, <&vdev0vring1>, + <&vdev1vring0>, <&vdev1vring1>, <&rsc_table>, <&m7_reserved>; + status = "okay"; +}; + /* SMARC GBE0 */ &enetc_port0 { pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/freescale/imx95.dtsi b/arch/arm64/boot/dts/freescale/imx95.dtsi index 3e35c956a4d7..f8760ac067fa 100644 --- a/arch/arm64/boot/dts/freescale/imx95.dtsi +++ b/arch/arm64/boot/dts/freescale/imx95.dtsi @@ -272,6 +272,13 @@ opp-1000000000 { }; }; + cm7: remoteproc-cm7 { + compatible = "fsl,imx95-cm7"; + mboxes = <&mu7 0 1>, <&mu7 1 1>, <&mu7 3 1>; + mbox-names = "tx", "rx", "rxdb"; + status = "disabled"; + }; + clk_ext1: clock-ext1 { compatible = "fixed-clock"; #clock-cells = <0>; -- 2.43.0
