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 f91b80c8112911cddcf73cd0b9149198a2ac86b8..0bd9eb5d83b1e801370427397efa0b3a13aaf25e 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
@@ -55,28 +55,20 @@
 		status = "disabled";
 	};
 
-	rpmsg_i2s: rpmsg-i2s {
-		compatible = "fsl,imx8mn-rpmsg-i2s";
-		/* the audio device index in m4 domain */
-		fsl,audioindex = <0> ;
-		fsl,dma-buffer-size = <0x6000000>;
+	rpmsg_audio: rpmsg_audio {
+		compatible = "fsl,imx8mn-rpmsg-audio";
+		model = "wm8524-audio";
 		fsl,enable-lpa;
+		fsl,rpmsg-out;
 		clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
 			 <&clk IMX8MN_CLK_SAI3_ROOT>,
 			 <&clk IMX8MN_CLK_SDMA3_ROOT>,
 			 <&clk IMX8MN_AUDIO_PLL1_OUT>,
 			 <&clk IMX8MN_AUDIO_PLL2_OUT>;
-		clock-names = "bus", "mclk", "dma", "pll8k", "pll11k";
+		clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";
 		status = "okay";
 	};
 
-	sound-rpmsg {
-		compatible = "fsl,imx-audio-rpmsg";
-		model = "wm8524-audio";
-		cpu-dai = <&rpmsg_i2s>;
-		rpmsg-out;
-	};
-
 	imx8mn-cm7 {
 		compatible = "fsl,imx8mn-cm7";
 		rsc-da = <0xb8000000>;
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 0d4fd5514d872fcaddb4b028195793dafed783f4..608fe3e88c2e03d750fea0803476db17ce2aa3ce 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
@@ -50,28 +50,20 @@
 		status = "disabled";
 	};
 
-	rpmsg_i2s: rpmsg-i2s {
-		compatible = "fsl,imx8mn-rpmsg-i2s";
-		/* the audio device index in m4 domain */
-		fsl,audioindex = <0> ;
-		fsl,dma-buffer-size = <0x6000000>;
+	rpmsg_audio: rpmsg_audio {
+		compatible = "fsl,imx8mn-rpmsg-audio";
+		model = "wm8524-audio";
 		fsl,enable-lpa;
+		fsl,rpmsg-out;
 		clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
 			 <&clk IMX8MN_CLK_SAI3_ROOT>,
 			 <&clk IMX8MN_CLK_SDMA3_ROOT>,
 			 <&clk IMX8MN_AUDIO_PLL1_OUT>,
 			 <&clk IMX8MN_AUDIO_PLL2_OUT>;
-		clock-names = "bus", "mclk", "dma", "pll8k", "pll11k";
+		clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";
 		status = "okay";
 	};
 
-	sound-rpmsg {
-		compatible = "fsl,imx-audio-rpmsg";
-		model = "wm8524-audio";
-		cpu-dai = <&rpmsg_i2s>;
-		rpmsg-out;
-	};
-
 	imx8mn-cm7 {
 		compatible = "fsl,imx8mn-cm7";
 		rsc-da = <0xb8000000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
index edb377899ead97bee61d167d2dea31cacb3a1e55..2c71397e0ec657c22b04ebfc7afee1bbdc6a26a8 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
@@ -51,28 +51,20 @@
 		status = "disabled";
 	};
 
-	rpmsg_i2s: rpmsg-i2s {
-		compatible = "fsl,imx8mn-rpmsg-i2s";
-		/* the audio device index in m4 domain */
-		fsl,audioindex = <0> ;
-		fsl,dma-buffer-size = <0x6000000>;
+	rpmsg_audio: rpmsg_audio {
+		compatible = "fsl,imx8mn-rpmsg-audio";
+		model = "wm8524-audio";
 		fsl,enable-lpa;
+		fsl,rpmsg-out;
 		clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
 			 <&clk IMX8MN_CLK_SAI3_ROOT>,
 			 <&clk IMX8MN_CLK_SDMA3_ROOT>,
 			 <&clk IMX8MN_AUDIO_PLL1_OUT>,
 			 <&clk IMX8MN_AUDIO_PLL2_OUT>;
-		clock-names = "bus", "mclk", "dma", "pll8k", "pll11k";
+		clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";
 		status = "okay";
 	};
 
-	sound-rpmsg {
-		compatible = "fsl,imx-audio-rpmsg";
-		model = "wm8524-audio";
-		cpu-dai = <&rpmsg_i2s>;
-		rpmsg-out;
-	};
-
 	imx8mn-cm7 {
 		compatible = "fsl,imx8mn-cm7";
 		rsc-da = <0xb8000000>;