Merge tag 'asoc-fix-v6.6-merge-window' of https://git.kernel.org/pub/scm/linux/kernel...
authorTakashi Iwai <tiwai@suse.de>
Thu, 7 Sep 2023 12:10:36 +0000 (14:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 7 Sep 2023 12:10:36 +0000 (14:10 +0200)
ASoC: Fixes for v6.6

A bunch of fixes and new IDs that came in since the initial pull request
- all driver specific and nothing too exciting.

There's a trivial conflict in the AMD driver ID table due to the last
v6.5 fixes not having been merged up.

1  2 
sound/soc/amd/yc/acp6x-mach.c

@@@ -217,7 -217,14 +217,14 @@@ static const struct dmi_system_id yc_ac
                .driver_data = &acp6x_card,
                .matches = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 -                      DMI_MATCH(DMI_PRODUCT_NAME, "82"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "82TL"),
+               }
+       },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "82V2"),
                }
        },
        {