| Message ID | 20230512181702.117483-1-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ASoC: SOF: Intel: hda-dai: prepare LNL support | expand |
On Fri, 12 May 2023 13:16:53 -0500, Pierre-Louis Bossart wrote: > The HDAudio support has not changed much since CometLake/2019: the > code was reshuffled for IPC4 support and we used hdac_hda for external > and Display Audio codec, but the hda-dai code was only used for > HDAudio codecs. > > In the LunarLake architecture, all endpoints (HDaudio, SSP, DMIC, > SoundWire) are handled with the HDaudio DMA, which requires us to > revisit the definitions of HDA_LINK, and remove the mutual exclusion > between NOCODEC and HDA_LINK: we do want the ability to test SSP/DMIC > in NOCODEC mode even with an HDA DMA. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/9] ASoC: SOF: Intel: hda-dai: simplify .prepare callback commit: 3886518fdb6d4c3f5a84648474a857d63749af78 [2/9] ASoC: SOF: Intel: hda-dai: remove use of cpu_dai->component drvdata commit: de8e2d5d8024670eaa35ae4c9b9efb76ca6cc8de [3/9] ASoC: SOF: Intel: fix DAI number mismatch commit: 45f3c2f83a089a1f21ea089e07e3118b87116cab [4/9] ASoC: SOF: Intel: clarify initialization when HDA_AUDIO_CODEC is not used commit: fb0bdfe2a056a73cd221a9a415ccafc71d814dc2 [5/9] ASoC: SOF: Intel: Kconfig: move selection of PROBE_WORK_QUEUE commit: 2dddff71e9ae973e46287c4e5a7d9206faa6c5e8 [6/9] ASoC: SOF: Intel: hda-dai: move hda_dai_prepare() code commit: caf7ad845e90f8ac29d7342bea6d9f1fc392c953 [7/9] ASoC: SOF: Intel: hda-dai: mark functions as __maybe_unused commit: b7b71b8cbd48b435e7e70a27f96b43a8270ec675 [8/9] ASoC: SOF: Intel: hda-dai: use HDA_LINK instead of HDA_AUDIO_CODEC commit: 746a78c2864ca90e4a8783838adf6d765f6282da [9/9] ASoC: SOF: Intel: remove mutual exclusion between NOCODEC and HDA_LINK commit: fdecd4aaf80af23f946ad97f6fb90c1f553fcdcc 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
The HDAudio support has not changed much since CometLake/2019: the code was reshuffled for IPC4 support and we used hdac_hda for external and Display Audio codec, but the hda-dai code was only used for HDAudio codecs. In the LunarLake architecture, all endpoints (HDaudio, SSP, DMIC, SoundWire) are handled with the HDaudio DMA, which requires us to revisit the definitions of HDA_LINK, and remove the mutual exclusion between NOCODEC and HDA_LINK: we do want the ability to test SSP/DMIC in NOCODEC mode even with an HDA DMA. This code change exposed a number of issues, with a useless .prepare callback, a DAI number mismatch and the need to support SoundWire which is handled by a different component in drivers/soundwire/intel_ace2.c. Pierre-Louis Bossart (9): ASoC: SOF: Intel: hda-dai: simplify .prepare callback ASoC: SOF: Intel: hda-dai: remove use of cpu_dai->component drvdata ASoC: SOF: Intel: fix DAI number mismatch ASoC: SOF: Intel: clarify initialization when HDA_AUDIO_CODEC is not used ASoC: SOF: Intel: Kconfig: move selection of PROBE_WORK_QUEUE ASoC: SOF: Intel: hda-dai: move hda_dai_prepare() code ASoC: SOF: Intel: hda-dai: mark functions as __maybe_unused ASoC: SOF: Intel: hda-dai: use HDA_LINK instead of HDA_AUDIO_CODEC ASoC: SOF: Intel: remove mutual exclusion between NOCODEC and HDA_LINK sound/soc/sof/intel/Kconfig | 3 +- sound/soc/sof/intel/hda-bus.c | 11 +++- sound/soc/sof/intel/hda-dai-ops.c | 4 +- sound/soc/sof/intel/hda-dai.c | 104 +++++++++++++++--------------- sound/soc/sof/intel/hda.h | 2 +- 5 files changed, 63 insertions(+), 61 deletions(-)