diff options
| author | Daniel Baluta <daniel.baluta@nxp.com> | 2020-10-05 18:47:42 +0300 |
|---|---|---|
| committer | Daniel Baluta <daniel.baluta@nxp.com> | 2020-10-06 13:29:55 +0300 |
| commit | 4b99159456eea84dac30429195d46411374a502e (patch) | |
| tree | 0242c684299f31469ca2b7995a278f2b445919b1 | |
| parent | 4bf6280655d4eb379c419b125d11b0b72ccf418c (diff) | |
MLK-24668-4 arm64: dts: imx8qxp-sof-wm8960: Remove FSL DAI generic node
This removes FSL DAI generic node (as per upstream guidance)
and move all resource handling to dsp node.
Reviewed-by: Paul Olaru <paul.olaru@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts index a8dc94e4565e..6eeda70d1a91 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts @@ -12,35 +12,6 @@ status = "disabled"; }; - sai1_port: sai-port { - #sound-dai-cells = <0>; - compatible = "fsl,sai-dai"; - - dai-index = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_sai1>; - - power-domains = <&pd IMX_SC_R_SAI_1>, - <&pd IMX_SC_R_DMA_0_CH14>, - <&pd IMX_SC_R_DMA_0_CH15>, - <&pd IMX_SC_R_AUDIO_CLK_0>, - <&pd IMX_SC_R_AUDIO_CLK_1>, - <&pd IMX_SC_R_AUDIO_PLL_0>, - <&pd IMX_SC_R_AUDIO_PLL_1>; - - clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; - clocks = <&sai1_lpcg 1>, <&clk_dummy>, <&sai1_lpcg 0>, - <&clk_dummy>, <&clk_dummy>; - assigned-clocks = <&acm IMX_ADMA_ACM_SAI1_MCLK_SEL>, - <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>, - <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC0>, - <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC1>, - <&sai1_lpcg 0>; /* FIXME: should be sai1, original code is 0 */ - assigned-clock-parents = <&aud_pll_div0_lpcg 0>; - assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>; - status="okay"; - }; - sof-sound-wm8960 { compatible = "simple-audio-card"; label = "wm8960-audio"; @@ -68,10 +39,7 @@ simple-audio-card,dai-link { format = "i2s"; cpu { - sound-dai = <&sai1_port>; - }; - plat { - sound-dai = <&dsp>; + sound-dai = <&dsp 1>; }; sndcodec: codec { sound-dai = <&wm8960>; @@ -115,8 +83,36 @@ }; &dsp { - #sound-dai-cells = <0>; + #sound-dai-cells = <1>; compatible = "fsl,imx8qxp-dsp"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; + + power-domains = <&pd IMX_SC_R_SAI_1>, + <&pd IMX_SC_R_DMA_0_CH14>, + <&pd IMX_SC_R_DMA_0_CH15>, + <&pd IMX_SC_R_AUDIO_CLK_0>, + <&pd IMX_SC_R_AUDIO_CLK_1>, + <&pd IMX_SC_R_AUDIO_PLL_0>, + <&pd IMX_SC_R_AUDIO_PLL_1>, + <&pd IMX_SC_R_MU_13A>, + <&pd IMX_SC_R_MU_13B>, + <&pd IMX_SC_R_DSP>, + <&pd IMX_SC_R_DSP_RAM>, + <&pd IMX_SC_R_IRQSTR_DSP>; + + + clock-names = "sai1_bus", "sai1_mclk0", "sai1_mclk1", "sai1_mclk2", "sai1_mclk3"; + clocks = <&sai1_lpcg 1>, <&clk_dummy>, <&sai1_lpcg 0>, + <&clk_dummy>, <&clk_dummy>; + assigned-clocks = <&acm IMX_ADMA_ACM_SAI1_MCLK_SEL>, + <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>, + <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC0>, + <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC1>, + <&sai1_lpcg 0>; /* FIXME: should be sai1, original code is 0 */ + assigned-clock-parents = <&aud_pll_div0_lpcg 0>; + assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>; + reg = <0x596e8000 0x88000>; tplg-name = "sof-imx8qxp-wm8960.tplg"; machine-drv-name = "asoc-simple-card"; |