ASoC: Intel: sof_sdw: remove FOUR_SPEAKER quirks
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Thu, 11 Apr 2024 22:03:40 +0000 (17:03 -0500)
committerMark Brown <broonie@kernel.org>
Sun, 14 Apr 2024 07:54:26 +0000 (16:54 +0900)
commit744866d28fe6b1a651e63d03a57e06d66e3d460a
tree5ad548ad850840b42b5d1454b408d916b0c09dbf
parentb10cb955c6c0b8dbd9a768166d71cc12680b7fdf
ASoC: Intel: sof_sdw: remove FOUR_SPEAKER quirks

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>
sound/soc/intel/boards/sof_sdw.c
sound/soc/intel/boards/sof_sdw_common.h