[v2,0/4] ASoC: SOF: Intel: override mclk_id for ES8336 support

Message

Pierre-Louis Bossart Sept. 19, 2022, 11:53 a.m. UTC

This patchset solves a known issue with ES8336 platforms wrt MCLK
selection. Most of the devices use the MCLK0 signal, but some devices
do use the MCLK1 signal.

The MCLK is defined in the topology, it would be a nightmare to
generate more topology files just for one MCLK difference. With a
minor extension to the intel-nhlt library, the MCLK information can be
found by parsing the NHLT table, and we can override the mclk_id at
boot time.

The only known issues for this platform remain the detection of GPIO
and microphone connections, currently only possible with manual
quirks.

Thanks to Eugene J. Markow for testing this patchset.

v2: addressed comments from Takashi and Amadeusz
Better error handling for the 1.5 case
Report error at the library level when 2 mclks are used

Pierre-Louis Bossart (4):
  ASoC: SOF: Intel: hda: refine SSP count support
  ASoC: SOF: add quirk to override topology mclk_id
  ALSA: hda: intel-nhlt: add intel_nhlt_ssp_mclk_mask()
  ASoC: SOF: Intel: hda: override mclk_id after parsing NHLT SSP blob

 include/sound/intel-nhlt.h    |  7 ++++
 sound/hda/intel-nhlt.c        | 79 +++++++++++++++++++++++++++++++++++
 sound/soc/sof/intel/hda.c     | 39 +++++++++++++++++
 sound/soc/sof/intel/hda.h     |  2 +
 sound/soc/sof/intel/mtl.c     |  2 +-
 sound/soc/sof/intel/tgl.c     |  8 ++--
 sound/soc/sof/ipc3-topology.c |  7 ++++
 sound/soc/sof/sof-priv.h      |  4 ++
 8 files changed, 143 insertions(+), 5 deletions(-)

Comments

Mark Brown Sept. 20, 2022, 8:46 p.m. UTC | #1

On Mon, 19 Sep 2022 13:53:46 +0200, Pierre-Louis Bossart wrote:
> This patchset solves a known issue with ES8336 platforms wrt MCLK
> selection. Most of the devices use the MCLK0 signal, but some devices
> do use the MCLK1 signal.
> 
> The MCLK is defined in the topology, it would be a nightmare to
> generate more topology files just for one MCLK difference. With a
> minor extension to the intel-nhlt library, the MCLK information can be
> found by parsing the NHLT table, and we can override the mclk_id at
> boot time.
> 
> [...]

Applied to

   broonie/sound.git for-next

Thanks!

[1/4] ASoC: SOF: Intel: hda: refine SSP count support
      commit: 9ccbc2e12e01b39b804774c3207d2474dd992d95
[2/4] ASoC: SOF: add quirk to override topology mclk_id
      commit: d136949dd8e2e309dc2f186507486b71cbe9acdb
[3/4] ALSA: hda: intel-nhlt: add intel_nhlt_ssp_mclk_mask()
      commit: 72176fccd5de1d9cf61e42771bb00567723f3353
[4/4] ASoC: SOF: Intel: hda: override mclk_id after parsing NHLT SSP blob
      commit: d9252772cdc811beedabbcf21ef856d09b87d1dd

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark