diff options
| author | Daniel Baluta <daniel.baluta@nxp.com> | 2020-10-07 11:59:39 +0300 |
|---|---|---|
| committer | Daniel Baluta <daniel.baluta@nxp.com> | 2020-10-07 11:59:39 +0300 |
| commit | c19a2d13c1bb5f768c5de52320f682bd093a6d35 (patch) | |
| tree | 87f6562df5ebd46f58ba61d36826a61dbd27691d /arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts | |
| parent | 56e2a4933cf90a07825e3ebbccb7a16abd671933 (diff) | |
MLK-24615-3 arm64: dts: imx8mp-sof-wm8960: Remove FSL DAI generic node
This removes FSL DAI generic node (as per upstream guidance)
and moves all resource handling to dsp node.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts index a0607ca2a69e..65c627b407d1 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-sof-wm8960.dts @@ -12,27 +12,6 @@ status = "disabled"; }; - sai3_port: sai-port { - #sound-dai-cells = <0>; - compatible = "fsl,sai-dai"; - - dai-index = <3>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_sai3>; - - power-domains = <&audiomix_pd>; - - assigned-clocks = <&clk IMX8MP_CLK_SAI3>; - assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>; - assigned-clock-rates = <12288000>; - clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_IPG>, <&clk IMX8MP_CLK_DUMMY>, - <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>, <&clk IMX8MP_CLK_DUMMY>, - <&clk IMX8MP_CLK_DUMMY>; - clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; - - status="okay"; - }; - sof-sound-wm8960 { compatible = "simple-audio-card"; label = "wm8960-audio"; @@ -60,10 +39,7 @@ simple-audio-card,dai-link { format = "i2s"; cpu { - sound-dai = <&sai3_port>; - }; - plat { - sound-dai = <&dsp>; + sound-dai = <&dsp 0>; }; sndcodec: codec { sound-dai = <&codec>; @@ -73,18 +49,34 @@ }; &dsp { - #sound-dai-cells = <0>; + #sound-dai-cells = <1>; compatible = "fsl,imx8mp-dsp"; - reg = <0x0 0x3B6E8000 0x0 0x88000>; - tplg-name = "sof-imx8mp-wm8960.tplg"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai3>; + + power-domains = <&audiomix_pd>; clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_OCRAMA_IPG>, <&audiomix_clk IMX8MP_CLK_AUDIOMIX_DSP_ROOT>, <&audiomix_clk IMX8MP_CLK_AUDIOMIX_DSPDBG_ROOT>, <&audiomix_clk IMX8MP_CLK_AUDIOMIX_MU2_ROOT>, <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SDMA3_ROOT>, - <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_IPG>; - clock-names = "ocram", "core", "debug", "mu2", "sdma3", "sai3_ipg"; + <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_IPG>, + <&clk IMX8MP_CLK_DUMMY>, + <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>, + <&clk IMX8MP_CLK_DUMMY>, + <&clk IMX8MP_CLK_DUMMY>; + clock-names = "ocram", "core", "debug", "mu2", "sdma3", + "sai3_bus", "sai3_mclk0", "sai3_mclk1", "sai3_mclk2", "sai3_mclk3"; + + assigned-clocks = <&clk IMX8MP_CLK_SAI3>; + assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>; + assigned-clock-rates = <12288000>; + + + reg = <0x0 0x3B6E8000 0x0 0x88000>; + tplg-name = "sof-imx8mp-wm8960.tplg"; + machine-drv-name = "asoc-simple-card"; status = "okay"; }; |