From: Mark Brown <broonie@kernel.org>
Date: Fri, 12 May 2023 04:14:20 +0000 (+0900)
Subject: ASoC: Merge up fixes for CI
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1946dda47c8807517ccaa8caf8ee7de3498db531;p=linux.git

ASoC: Merge up fixes for CI

Avoid tripping over fixed issues in CI.
---

1946dda47c8807517ccaa8caf8ee7de3498db531
diff --cc sound/soc/amd/yc/acp6x-mach.c
index a134eba4d59aa,4406a5def0768..31e466917c3d4
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@@ -311,13 -311,13 +311,20 @@@ static const struct dmi_system_id yc_ac
  			DMI_MATCH(DMI_BOARD_NAME, "8A22"),
  		}
  	},
 +	{
 +		.driver_data = &acp6x_card,
 +		.matches = {
 +			DMI_MATCH(DMI_BOARD_VENDOR, "MECHREVO"),
 +			DMI_MATCH(DMI_BOARD_NAME, "MRID6"),
 +		}
 +	},
+ 	{
+ 		.driver_data = &acp6x_card,
+ 		.matches = {
+ 			DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
+ 			DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
+ 		}
+ 	},
  	{}
  };