ALSA: hda: Move SST device entries to AVS

The avs-driver succeeds the skylake-driver. It suppots all
configurations of its predecessor and more. Reflect that in the existing
selection table.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20240814083929.1217319-2-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index 913880b..f018bd7 100644 (file)
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -56,35 +56,31 @@ static const struct config_entry config_table[] = {
        },
 #endif
 /*
- * Apollolake (Broxton-P)
+ * Skylake, Kabylake, Apollolake
  * the legacy HDAudio driver is used except on Up Squared (SOF) and
  * Chromebooks (SST), as well as devices based on the ES8336 codec
  */
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS)
        {
-               .flags = FLAG_SOF,
-               .device = PCI_DEVICE_ID_INTEL_HDA_APL,
+               .flags = FLAG_SST,
+               .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
                .dmi_table = (const struct dmi_system_id []) {
                        {
-                               .ident = "Up Squared",
+                               .ident = "Google Chromebooks",
                                .matches = {
-                                       DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
-                                       DMI_MATCH(DMI_BOARD_NAME, "UP-APL01"),
+                                       DMI_MATCH(DMI_SYS_VENDOR, "Google"),
                                }
                        },
                        {}
                }
        },
        {
-               .flags = FLAG_SOF,
-               .device = PCI_DEVICE_ID_INTEL_HDA_APL,
-               .codec_hid =  &essx_83x6,
+               .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
+               .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
        },
-#endif
-#if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
        {
                .flags = FLAG_SST,
-               .device = PCI_DEVICE_ID_INTEL_HDA_APL,
+               .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
                .dmi_table = (const struct dmi_system_id []) {
                        {
                                .ident = "Google Chromebooks",
@@ -95,17 +91,13 @@ static const struct config_entry config_table[] = {
                        {}
                }
        },
-#endif
-/*
- * Skylake and Kabylake use legacy HDAudio driver except for Google
- * Chromebooks (SST)
- */
-
-/* Sunrise Point-LP */
-#if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL)
+       {
+               .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
+               .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
+       },
        {
                .flags = FLAG_SST,
-               .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
+               .device = PCI_DEVICE_ID_INTEL_HDA_APL,
                .dmi_table = (const struct dmi_system_id []) {
                        {
                                .ident = "Google Chromebooks",
@@ -116,29 +108,26 @@ static const struct config_entry config_table[] = {
                        {}
                }
        },
-       {
-               .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
-               .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
-       },
 #endif
-/* Kabylake-LP */
-#if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
        {
-               .flags = FLAG_SST,
-               .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
+               .flags = FLAG_SOF,
+               .device = PCI_DEVICE_ID_INTEL_HDA_APL,
                .dmi_table = (const struct dmi_system_id []) {
                        {
-                               .ident = "Google Chromebooks",
+                               .ident = "Up Squared",
                                .matches = {
-                                       DMI_MATCH(DMI_SYS_VENDOR, "Google"),
+                                       DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
+                                       DMI_MATCH(DMI_BOARD_NAME, "UP-APL01"),
                                }
                        },
                        {}
                }
        },
        {
-               .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
-               .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
+               .flags = FLAG_SOF,
+               .device = PCI_DEVICE_ID_INTEL_HDA_APL,
+               .codec_hid =  &essx_83x6,
        },
 #endif