]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: Merge up fixes
authorMark Brown <broonie@kernel.org>
Mon, 30 Mar 2026 16:59:52 +0000 (17:59 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 30 Mar 2026 16:59:52 +0000 (17:59 +0100)
Merge branch 'for-7.0' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-7.1 for both ASoC and general bug fixes to support testing.

1  2 
sound/soc/amd/yc/acp6x-mach.c
sound/soc/sdca/sdca_functions.c
sound/soc/sof/ipc4-topology.c

index ac920263af9ee6f9cef81559ab426721c3b44859,aa62009331825482f7b6fd91633e787e83e85188..85579c81378fbeca425195319480c3d35def5873
@@@ -45,13 -45,13 +45,20 @@@ static struct snd_soc_card acp6x_card 
  };
  
  static const struct dmi_system_id yc_acp_quirk_table[] = {
 +      {
 +              .driver_data = &acp6x_card,
 +              .matches = {
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "Lecoo"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "Bellator N176"),
 +              }
 +      },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Laptop 15-fc0xxx"),
+               }
+       },
        {
                .driver_data = &acp6x_card,
                .matches = {
Simple merge
Simple merge