diff options
author | Mark Brown <broonie@kernel.org> | 2021-03-16 18:55:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-03-16 18:55:37 +0100 |
commit | f9dc51cc6676e0360dfcb1836b3d426a3ccf3093 (patch) | |
tree | ef2bc112c1de35acde65fc49c159c1db80ffef16 /sound/soc/sof/intel/hda-dsp.c | |
parent | ASoC: dt-bindings: fsl_spdif: Add compatible string for new platforms (diff) | |
parent | ASoC: rt5659: Update MCLK rate in set_sysclk() (diff) | |
download | linux-f9dc51cc6676e0360dfcb1836b3d426a3ccf3093.tar.xz linux-f9dc51cc6676e0360dfcb1836b3d426a3ccf3093.zip |
Merge series "Do not handle MCLK device clock in simple-card-utils" from Sameer Pujar <spujar@nvidia.com>:
With commit 1e30f642cf29 ("ASoC: simple-card-utils: Fix device module clock")
simple-card-utils can control MCLK clock for rate updates or enable/disable.
But this is breaking some platforms where it is expected that codec drivers
would actually handle the MCLK clock. One such example is following platform.
- "arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts"
In above case codec, wm8904, is using internal PLL and configures sysclk
based on fixed MCLK input. In such cases it is expected that, required PLL
output or sysclk, is just passed via set_sysclk() callback and card driver
need not actually update MCLK rate. Instead, codec can take ownership of
this clock and do the necessary configuration.
So the original commit is reverted and codec driver for rt5659 is updated
to fix my board which has this codec.
Sameer Pujar (2):
ASoC: simple-card-utils: Do not handle device clock
ASoC: rt5659: Update MCLK rate in set_sysclk()
sound/soc/codecs/rt5659.c | 5 +++++
sound/soc/generic/simple-card-utils.c | 13 +++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
--
2.7.4
Diffstat (limited to 'sound/soc/sof/intel/hda-dsp.c')
0 files changed, 0 insertions, 0 deletions