ASoC: Intel: sof_sdw: remove FOUR_SPEAKER quirks

Browse source

This patch removes a confusion between speakers and amplifiers.

The existing code keeps track of the number of amplifiers and reports
it in the 'cfg-amp' component string.

The number of speakers is defined with quirks, but those quirks are
not consistently added: in the MeteorLake case, none of the supported
platforms used such a quirk, and UCM does not use the values reported
anyways. The notion of 'FOUR_SPEAKERS' is also obsolete now with some
platforms having more than four speakers.

Let's just remove all this and only report the number of amplifiers.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20240411220347.131267-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

...

This commit is contained in:

Pierre-Louis Bossart 2024-04-11 17:03:40 -05:00 • committed by Mark Brown

parent b10cb955c6

commit 744866d28f

No known key found for this signature in database

GPG key ID: 24D68B725D5487D0

2 changed files with 23 additions and 46 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

68

sound/soc/intel/boards/sof_sdw.c

View file

1

sound/soc/intel/boards/sof_sdw_common.h

View file