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-6 arm64: dts: imx8qxp-sof-cs4288: 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:25:45 +03:00
parent d1a296c0ba
commit 2cc8fc5c0d
1 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts
View File

@ -12,35 +12,6 @@
status = "disabled";
};
esai0_port: esai-port {
#sound-dai-cells = <0>;
compatible = "fsl,esai-dai";
dai-index = <0>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esai0>;
power-domains = <&pd IMX_SC_R_ESAI_0>,
<&pd IMX_SC_R_DMA_2_CH6>,
<&pd IMX_SC_R_DMA_2_CH7>,
<&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>;
clocks = <&esai0_lpcg 1>, <&esai0_lpcg 0>, <&esai0_lpcg 1>,
<&clk_dummy>;
clock-names = "core", "extal", "fsys", "spba";
assigned-clocks = <&acm IMX_ADMA_ACM_ESAI0_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>,
<&esai0_lpcg 0>;
assigned-clock-parents = <&aud_pll_div0_lpcg 0>;
assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>;
status="okay";
};
sof-audio-cs42888 {
compatible = "simple-audio-card";
label = "imx-cs42888";
@ -65,10 +36,7 @@
simple-audio-card,dai-link {
format = "i2s";
cpu {
sound-dai = <&esai0_port>;
};
plat {
sound-dai = <&dsp>;
sound-dai = <&dsp 0>;
};
codec {
sound-dai = <&cs42888>;
@ -120,20 +88,42 @@
&dsp {
compatible = "fsl,imx8qm-dsp";
#sound-dai-cells = <0>;
tplg-name = "sof-imx8qxp-cs42888.tplg";
machine-drv-name = "asoc-simple-card";
status = "okay";
power-domains = <&pd IMX_SC_R_MU_13A>,
#sound-dai-cells = <1>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esai0>;
power-domains = <&pd IMX_SC_R_ESAI_0>,
<&pd IMX_SC_R_DMA_2_CH6>,
<&pd IMX_SC_R_DMA_2_CH7>,
<&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>;
clocks = <&esai0_lpcg 1>, <&esai0_lpcg 0>, <&esai0_lpcg 1>,
<&clk_dummy>;
clock-names = "esai0_core", "esai0_extal", "esai0_fsys", "esai0_spba";
assigned-clocks = <&acm IMX_ADMA_ACM_ESAI0_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>,
<&esai0_lpcg 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-cs42888.tplg";
machine-drv-name = "asoc-simple-card";
status = "okay";
};
&amix {