diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-09-07 14:10:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-09-07 14:10:36 +0200 |
| commit | ecc8b4d0b6e19031733f28537971f8c5088dada2 (patch) | |
| tree | 1d6f6f539a98a42a3dedb014c02ec2542625add4 /sound/soc/amd | |
| parent | ALSA: hda/realtek - ALC287 I2S speaker platform support (diff) | |
| parent | ASoC: amd: yc: Fix a non-functional mic on Lenovo 82TL (diff) | |
| download | linux-ecc8b4d0b6e19031733f28537971f8c5088dada2.tar.xz linux-ecc8b4d0b6e19031733f28537971f8c5088dada2.zip | |
Merge tag 'asoc-fix-v6.6-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
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.
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/yc/acp6x-mach.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index b304b3562c82..3ec15b46fa35 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -217,6 +217,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { .driver_data = &acp6x_card, .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "82TL"), + } + }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), DMI_MATCH(DMI_PRODUCT_NAME, "82V2"), } }, @@ -328,6 +335,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { { .driver_data = &acp6x_card, .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HP"), + DMI_MATCH(DMI_BOARD_NAME, "8A3E"), + } + }, + { + .driver_data = &acp6x_card, + .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "MECHREVO"), DMI_MATCH(DMI_BOARD_NAME, "MRID6"), } |