diff options
| author | Mark Brown <broonie@kernel.org> | 2020-01-23 15:36:45 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-23 15:36:45 +0300 |
| commit | a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b (patch) | |
| tree | d9147ac16e1af83463bad4e45b233bc8e51f2e0e /sound/soc/codecs/cs47l85.c | |
| parent | 20230620b44510ce968a719a1d6ee7483583178d (diff) | |
| parent | d8e2e0d2491e78f3f7b451c3a93ba29950efe2cf (diff) | |
| download | linux-a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b.tar.xz | |
Merge branch 'asoc-5.6' into asoc-next
Diffstat (limited to 'sound/soc/codecs/cs47l85.c')
| -rw-r--r-- | sound/soc/codecs/cs47l85.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 33ecff45bd6e..bef3471f482d 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -790,15 +790,18 @@ static const struct snd_kcontrol_new cs47l85_output_anc_src[] = { static const struct snd_soc_dapm_widget cs47l85_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("SYSCLK", MADERA_SYSTEM_CLOCK_1, MADERA_SYSCLK_ENA_SHIFT, 0, madera_sysclk_ev, - SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_SUPPLY("ASYNCCLK", MADERA_ASYNC_CLOCK_1, - MADERA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0), + MADERA_ASYNC_CLK_ENA_SHIFT, 0, madera_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_SUPPLY("OPCLK", MADERA_OUTPUT_SYSTEM_CLOCK, MADERA_OPCLK_ENA_SHIFT, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", MADERA_OUTPUT_ASYNC_CLOCK, MADERA_OPCLK_ASYNC_ENA_SHIFT, 0, NULL, 0), -SND_SOC_DAPM_SUPPLY("DSPCLK", MADERA_DSP_CLOCK_1, - MADERA_DSP_CLK_ENA_SHIFT, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("DSPCLK", MADERA_DSP_CLOCK_1, MADERA_DSP_CLK_ENA_SHIFT, + 0, madera_clk_ev, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0, 0), SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0, 0), |