]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: Intel: sof-sdw: really remove FOUR_SPEAKER quirk
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 26 Apr 2024 15:21:20 +0000 (10:21 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jun 2024 11:52:32 +0000 (13:52 +0200)
commit 0bab4cfd7c1560095e29919e2ebe01783b9096dc upstream.

Two independent GitHub PRs let to the addition of one quirk after it
was removed..

Fixes: b10cb955c6c0 ("ASoC: Intel: sof_sdw: add quirk for Dell SKU 0C0F")
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240426152123.36284-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/intel/boards/sof_sdw.c

index a5e2ffcc36e2ecb7f475b1ec0635a5031057c090..5d0125ef140c36d678d71d144cfd8e716f58769e 100644 (file)
@@ -436,8 +436,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0C0F")
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-                                       RT711_JD2 |
-                                       SOF_SDW_FOUR_SPK),
+                                       RT711_JD2),
        },
        {
                .callback = sof_sdw_quirk_cb,