Unverified Commit e60ffc48 authored Dec 06, 2020 by Hans de Goede Committed by Mark Brown Dec 08, 2020

ASoC: Intel: cht_bsw_nau8824: Drop compress-cpu-dai bits



When using the snd-soc-sst-acpi driver then the compress-cpu-dai bits are
not used, the cht_bsw_nau8824 machine-driver is the only BYT/CHT driver
defining them.

When using the snd-sof-acpi driver then the presence of the
compress-cpu-dai bits breaks things because the sof topology file for
by/cht devices does not contain routing info for them.

Drop the compress-cpu-dai bits, fixing the snd-sof-acpi driver not
working on devices using the cht_bsw_nau8824 machine-driver.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20201206122436.13553-2-hdegoede@redhat.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 8f6cfbb6

sound/soc/intel/boards/cht_bsw_nau8824.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -176,9 +176,6 @@ SND_SOC_DAILINK_DEF(media,
		SND_SOC_DAILINK_DEF(deepbuffer,
		DAILINK_COMP_ARRAY(COMP_CPU("deepbuffer-cpu-dai")));

		SND_SOC_DAILINK_DEF(compress,
		DAILINK_COMP_ARRAY(COMP_CPU("compress-cpu-dai")));

		SND_SOC_DAILINK_DEF(ssp2_port,
		DAILINK_COMP_ARRAY(COMP_CPU("ssp2-port")));
		SND_SOC_DAILINK_DEF(ssp2_codec,
		@@ -209,11 +206,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
		.ops = &cht_aif1_ops,
		SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
		},
		[MERR_DPCM_COMPR] = {
		.name = "Compressed Port",
		.stream_name = "Compress",
		SND_SOC_DAILINK_REG(compress, dummy, platform),
		},
		/* Back End DAI links */
		{
		/* SSP2 - Codec */

Admin message