brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MLK-24668-5 arm64: dts: imx8qm-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>
This commit is contained in:
Daniel Baluta 2020-10-06 12:24:31 +03:00
parent 4b99159456
commit d1a296c0ba
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts
View File

@ -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_2_CH14>,
<&pd IMX_SC_R_DMA_2_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>;
@ -116,20 +84,44 @@
&dsp {
compatible = "fsl,imx8qm-dsp";
#sound-dai-cells = <0>;
tplg-name = "sof-imx8qxp-wm8960.tplg";
machine-drv-name = "asoc-simple-card";
status = "okay";
power-domains = <&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>;
#sound-dai-cells = <1>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai1>;
power-domains = <&pd IMX_SC_R_SAI_1>,
<&pd IMX_SC_R_DMA_2_CH14>,
<&pd IMX_SC_R_DMA_2_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>;
mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";
mboxes = <&lsio_mu13 2 0>,
<&lsio_mu13 2 1>,
<&lsio_mu13 3 0>,
<&lsio_mu13 3 1>;
tplg-name = "sof-imx8qxp-wm8960.tplg";
machine-drv-name = "asoc-simple-card";
status = "okay";
};
&wm8960 {