ASoC: Merge up fixes

Merge branch 'for-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-7.1

to get fixes into our development branch and resolve interactions with
the match tables.

diff --cc sound/soc/amd/yc/acp6x-mach.c
index 2b37330d4b3ca9d862a2baad055cb28eb8caeb92,6f1c105ca77e3896ed1c0a6628331e378bfba988..ac920263af9ee6f9cef81559ab426721c3b44859
--- 1/sound/soc/amd/yc/acp6x-mach.c
--- 2/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@@ -724,13 -717,20 +724,34 @@@ static const struct dmi_system_id yc_ac
                        DMI_MATCH(DMI_BOARD_NAME, "PM1503CDA"),
                }
        },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_BOARD_NAME, "BM1403CDA"),
+               }
+       },
++      {
++              .driver_data = &acp6x_card,
++              .matches = {
++                      DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
++                      DMI_MATCH(DMI_BOARD_NAME, "BM1403CDA"),
++              }
++      },
 +      {
 +              .driver_data = &acp6x_card,
 +              .matches = {
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "Thin A15 B7VF"),
 +              }
 +      },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Thin A15 B7VE"),
+               }
+       },
        {}
  };
  

diff --cc sound/soc/generic/simple-card-utils.c
Simple merge

diff --cc sound/soc/intel/catpt/device.c
Simple merge

diff --cc sound/soc/sof/topology.c
Simple merge