Merge tag 'asoc-fix-v6.19-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.19

A couple of small fixes and a couple of quirks, nothing major

+11 -2
+8
sound/soc/amd/yc/acp6x-mach.c
··· 682 DMI_MATCH(DMI_PRODUCT_NAME, "GOH-X"), 683 } 684 }, 685 {} 686 }; 687
··· 682 DMI_MATCH(DMI_PRODUCT_NAME, "GOH-X"), 683 } 684 }, 685 + { 686 + .driver_data = &acp6x_card, 687 + .matches = { 688 + DMI_MATCH(DMI_BOARD_VENDOR, "RB"), 689 + DMI_MATCH(DMI_BOARD_NAME, "XyloD5_RBU"), 690 + } 691 + }, 692 + 693 {} 694 }; 695
+1 -1
sound/soc/intel/boards/sof_es8336.c
··· 120 gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en); 121 122 if (quirk & SOF_ES8336_HEADPHONE_GPIO) 123 - gpiod_set_value_cansleep(priv->gpio_headphone, priv->speaker_en); 124 125 } 126
··· 120 gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en); 121 122 if (quirk & SOF_ES8336_HEADPHONE_GPIO) 123 + gpiod_set_value_cansleep(priv->gpio_headphone, !priv->speaker_en); 124 125 } 126
+1
sound/soc/intel/boards/sof_sdw.c
··· 838 SND_PCI_QUIRK(0x17aa, 0x2347, "Lenovo P16", SOC_SDW_CODEC_MIC), 839 SND_PCI_QUIRK(0x17aa, 0x2348, "Lenovo P16", SOC_SDW_CODEC_MIC), 840 SND_PCI_QUIRK(0x17aa, 0x2349, "Lenovo P1", SOC_SDW_CODEC_MIC), 841 {} 842 }; 843
··· 838 SND_PCI_QUIRK(0x17aa, 0x2347, "Lenovo P16", SOC_SDW_CODEC_MIC), 839 SND_PCI_QUIRK(0x17aa, 0x2348, "Lenovo P16", SOC_SDW_CODEC_MIC), 840 SND_PCI_QUIRK(0x17aa, 0x2349, "Lenovo P1", SOC_SDW_CODEC_MIC), 841 + SND_PCI_QUIRK(0x17aa, 0x3821, "Lenovo 0x3821", SOC_SDW_SIDECAR_AMPS), 842 {} 843 }; 844
+1 -1
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
··· 442 .adr = 0x000230025D132001ull, 443 .num_endpoints = 1, 444 .endpoints = &spk_r_endpoint, 445 - .name_prefix = "rt1320-1" 446 } 447 }; 448
··· 442 .adr = 0x000230025D132001ull, 443 .num_endpoints = 1, 444 .endpoints = &spk_r_endpoint, 445 + .name_prefix = "rt1320-2" 446 } 447 }; 448