Unverified Commit fb0bdfe2 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: clarify initialization when HDA_AUDIO_CODEC is not used 



For LunarLake support, we need to enable HDA_LINK but we also want the
ability to remove HDaudio codec support, e.g. for 'nocodec'
tests. This requires a small change in the bus initialization without
any codec-specific callbacks provided.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230512181702.117483-5-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45f3c2f8

sound/soc/sof/intel/hda-bus.c

+8 −3
Original line number Diff line number Diff line
@@ -70,9 +70,14 @@ void sof_hda_bus_init(struct snd_sof_dev *sdev, struct device *dev) 
{

	struct hdac_bus *bus = sof_to_bus(sdev);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_LINK)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	snd_hdac_ext_bus_init(bus, dev, &bus_core_ops, sof_hda_ext_ops);

#else /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

#else

	snd_hdac_ext_bus_init(bus, dev, NULL, NULL);

#endif

#else



	memset(bus, 0, sizeof(*bus));

	bus->dev = dev;
@@ -87,12 +92,12 @@ void sof_hda_bus_init(struct snd_sof_dev *sdev, struct device *dev) 
	bus->idx = 0;



	spin_lock_init(&bus->reg_lock);

#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

#endif /* CONFIG_SND_SOC_SOF_HDA_LINK */

}



void sof_hda_bus_exit(struct snd_sof_dev *sdev)

{

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_LINK)

	struct hdac_bus *bus = sof_to_bus(sdev);



	snd_hdac_ext_bus_exit(bus);