diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts index 7bcebc3e6a80fab16fdb1a694f17d0757e874b69..022f9e0be2d05786d931e52bd61b36a0f92dc6dc 100644 --- a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts @@ -150,19 +150,18 @@ spdif-out; }; - sound-rpmsg { - compatible = "fsl,imx-audio-rpmsg"; + rpmsg_audio: rpmsg-audio { + compatible = "fsl,imx8ulp-rpmsg-audio"; model = "wm8960-audio"; - cpu-dai = <&rpmsg_i2s>; + fsl,rpmsg-out; + fsl,rpmsg-in; audio-codec = <&wm8960>; memory-region = <&audio_reserved>; - rpmsg-out; - rpmsg-in; audio-routing = "LINPUT1", "MICB", "LINPUT3", "MICB"; + status = "okay"; }; - }; &dcnano { @@ -590,10 +589,6 @@ }; -&rpmsg_i2s { - status = "okay"; -}; - &sai5 { #sound-dai-cells = <0>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi b/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi index ccda8883b1229d718721ad240af944fa035ec56c..5bc28fedc7b0d3f6d29367d7ccec3b7c89addc46 100644 --- a/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi @@ -49,11 +49,6 @@ status = "okay"; }; - rpmsg_i2s: rpmsg-i2s { - compatible = "fsl,imx8ulp-rpmsg-i2s"; - status = "disabled"; - }; - tpm_rpchip_0: pwm { compatible = "fsl,pwm-rpchip"; #pwm-cells = <3>;