Skip to content

Commit 703896b

Browse files
torvaldstorvalds
committed
Merge tag 'sound-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Hopefully the last PR for 6.11, at least for this level of amount. In addition to the usual HD-audio quirks, there are more changes in ASoC, but all look small and device-specific fixes, and nothing stands out. The only slightly big change is sunxi I2S fix, which looks quite safe to apply, too" * tag 'sound-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits) ALSA: hda/realtek - Fix inactive headset mic jack for ASUS Vivobook 15 X1504VAP ALSA: hda/realtek: Support mute LED on HP Laptop 14-dq2xxx ALSA: hda/realtek: Enable Mute Led for HP Victus 15-fb1xxx ALSA: hda/realtek: extend quirks for Clevo V5[46]0 ASoC: codecs: lpass-va-macro: set the default codec version for sm8250 ALSA: hda: add HDMI codec ID for Intel PTL ALSA: hda/realtek: add patch for internal mic in Lenovo V145 ASoC: sunxi: sun4i-i2s: fix LRCLK polarity in i2s mode ASoC: amd: yc: Add a quirk for MSI Bravo 17 (D7VEK) ASoC: mediatek: mt8188-mt6359: Modify key ASoc: SOF: topology: Clear SOF link platform name upon unload ALSA: hda/conexant: Add pincfg quirk to enable top speakers on Sirius devices ASoC: SOF: ipc: replace "enum sof_comp_type" field with "uint32_t" ASoC: fix module autoloading ASoC: tda7419: fix module autoloading ASoC: google: fix module autoloading ASoC: intel: fix module autoloading ASoC: tegra: Fix CBB error during probe() ASoC: dapm: Fix UAF for snd_soc_pcm_runtime object ASoC: Intel: soc-acpi-cht: Make Lenovo Yoga Tab 3 X90F DMI match less strict ...
2 parents c3af225 + c491b04 commit 703896b

26 files changed

+160
-92
lines changed

‎include/sound/sof/topology.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ enum sof_comp_type {
5454
struct sof_ipc_comp {
5555
struct sof_ipc_cmd_hdr hdr;
5656
uint32_t id;
57-
enum sof_comp_type type;
57+
uint32_t type;
5858
uint32_t pipeline_id;
5959
uint32_t core;
6060

‎include/uapi/sound/sof/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/* SOF ABI version major, minor and patch numbers */
3030
#define SOF_ABI_MAJOR 3
3131
#define SOF_ABI_MINOR 23
32-
#define SOF_ABI_PATCH 0
32+
#define SOF_ABI_PATCH 1
3333

3434
/* SOF ABI version number. Format within 32bit word is MMmmmppp */
3535
#define SOF_ABI_MAJOR_SHIFT 24

‎sound/pci/hda/patch_conexant.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ enum {
307307
CXT_FIXUP_HEADSET_MIC,
308308
CXT_FIXUP_HP_MIC_NO_PRESENCE,
309309
CXT_PINCFG_SWS_JS201D,
310+
CXT_PINCFG_TOP_SPEAKER,
310311
};
311312

312313
/* for hda_fixup_thinkpad_acpi() */
@@ -974,6 +975,13 @@ static const struct hda_fixup cxt_fixups[] = {
974975
.type = HDA_FIXUP_PINS,
975976
.v.pins = cxt_pincfg_sws_js201d,
976977
},
978+
[CXT_PINCFG_TOP_SPEAKER] = {
979+
.type = HDA_FIXUP_PINS,
980+
.v.pins = (const struct hda_pintbl[]) {
981+
{ 0x1d, 0x82170111 },
982+
{ }
983+
},
984+
},
977985
};
978986

979987
static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -1070,6 +1078,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
10701078
SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),
10711079
SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
10721080
SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),
1081+
SND_PCI_QUIRK(0x2782, 0x12c3, "Sirius Gen1", CXT_PINCFG_TOP_SPEAKER),
1082+
SND_PCI_QUIRK(0x2782, 0x12c5, "Sirius Gen2", CXT_PINCFG_TOP_SPEAKER),
10731083
{}
10741084
};
10751085

@@ -1089,6 +1099,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = {
10891099
{ .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },
10901100
{ .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },
10911101
{ .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" },
1102+
{ .id = CXT_PINCFG_TOP_SPEAKER, .name = "sirius-top-speaker" },
10921103
{}
10931104
};
10941105

‎sound/pci/hda/patch_hdmi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4639,6 +4639,7 @@ HDA_CODEC_ENTRY(0x8086281d, "Meteor Lake HDMI", patch_i915_adlp_hdmi),
46394639
HDA_CODEC_ENTRY(0x8086281e, "Battlemage HDMI", patch_i915_adlp_hdmi),
46404640
HDA_CODEC_ENTRY(0x8086281f, "Raptor Lake P HDMI", patch_i915_adlp_hdmi),
46414641
HDA_CODEC_ENTRY(0x80862820, "Lunar Lake HDMI", patch_i915_adlp_hdmi),
4642+
HDA_CODEC_ENTRY(0x80862822, "Panther Lake HDMI", patch_i915_adlp_hdmi),
46424643
HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi),
46434644
HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi),
46444645
HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi),

‎sound/pci/hda/patch_realtek.c

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7538,6 +7538,7 @@ enum {
75387538
ALC236_FIXUP_HP_GPIO_LED,
75397539
ALC236_FIXUP_HP_MUTE_LED,
75407540
ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,
7541+
ALC236_FIXUP_LENOVO_INV_DMIC,
75417542
ALC298_FIXUP_SAMSUNG_AMP,
75427543
ALC298_FIXUP_SAMSUNG_AMP2,
75437544
ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
@@ -7637,6 +7638,7 @@ enum {
76377638
ALC287_FIXUP_LENOVO_14ARP8_LEGION_IAH7,
76387639
ALC287_FIXUP_LENOVO_SSID_17AA3820,
76397640
ALCXXX_FIXUP_CS35LXX,
7641+
ALC245_FIXUP_CLEVO_NOISY_MIC,
76407642
};
76417643

76427644
/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -9161,6 +9163,12 @@ static const struct hda_fixup alc269_fixups[] = {
91619163
.type = HDA_FIXUP_FUNC,
91629164
.v.func = alc236_fixup_hp_mute_led_micmute_vref,
91639165
},
9166+
[ALC236_FIXUP_LENOVO_INV_DMIC] = {
9167+
.type = HDA_FIXUP_FUNC,
9168+
.v.func = alc_fixup_inv_dmic,
9169+
.chained = true,
9170+
.chain_id = ALC283_FIXUP_INT_MIC,
9171+
},
91649172
[ALC298_FIXUP_SAMSUNG_AMP] = {
91659173
.type = HDA_FIXUP_FUNC,
91669174
.v.func = alc298_fixup_samsung_amp,
@@ -9970,6 +9978,12 @@ static const struct hda_fixup alc269_fixups[] = {
99709978
.type = HDA_FIXUP_FUNC,
99719979
.v.func = cs35lxx_autodet_fixup,
99729980
},
9981+
[ALC245_FIXUP_CLEVO_NOISY_MIC] = {
9982+
.type = HDA_FIXUP_FUNC,
9983+
.v.func = alc269_fixup_limit_int_mic_boost,
9984+
.chained = true,
9985+
.chain_id = ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
9986+
},
99739987
};
99749988

99759989
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -10218,6 +10232,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1021810232
SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),
1021910233
SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
1022010234
SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
10235+
SND_PCI_QUIRK(0x103c, 0x87fd, "HP Laptop 14-dq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
1022110236
SND_PCI_QUIRK(0x103c, 0x87fe, "HP Laptop 15s-fq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
1022210237
SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
1022310238
SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -10342,6 +10357,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1034210357
SND_PCI_QUIRK(0x103c, 0x8c16, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),
1034310358
SND_PCI_QUIRK(0x103c, 0x8c17, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),
1034410359
SND_PCI_QUIRK(0x103c, 0x8c21, "HP Pavilion Plus Laptop 14-ey0XXX", ALC245_FIXUP_HP_X360_MUTE_LEDS),
10360+
SND_PCI_QUIRK(0x103c, 0x8c30, "HP Victus 15-fb1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
1034510361
SND_PCI_QUIRK(0x103c, 0x8c46, "HP EliteBook 830 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
1034610362
SND_PCI_QUIRK(0x103c, 0x8c47, "HP EliteBook 840 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
1034710363
SND_PCI_QUIRK(0x103c, 0x8c48, "HP EliteBook 860 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -10479,6 +10495,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1047910495
SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),
1048010496
SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
1048110497
SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
10498+
SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC),
1048210499
SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
1048310500
SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
1048410501
SND_PCI_QUIRK(0x1043, 0x1e63, "ASUS H7606W", ALC285_FIXUP_CS35L56_I2C_2),
@@ -10619,7 +10636,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1061910636
SND_PCI_QUIRK(0x1558, 0xa600, "Clevo NL50NU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1062010637
SND_PCI_QUIRK(0x1558, 0xa650, "Clevo NP[567]0SN[CD]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1062110638
SND_PCI_QUIRK(0x1558, 0xa671, "Clevo NP70SN[CDE]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
10622-
SND_PCI_QUIRK(0x1558, 0xa763, "Clevo V54x_6x_TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
10639+
SND_PCI_QUIRK(0x1558, 0xa741, "Clevo V54x_6x_TNE", ALC245_FIXUP_CLEVO_NOISY_MIC),
10640+
SND_PCI_QUIRK(0x1558, 0xa763, "Clevo V54x_6x_TU", ALC245_FIXUP_CLEVO_NOISY_MIC),
1062310641
SND_PCI_QUIRK(0x1558, 0xb018, "Clevo NP50D[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1062410642
SND_PCI_QUIRK(0x1558, 0xb019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
1062510643
SND_PCI_QUIRK(0x1558, 0xb022, "Clevo NH77D[DC][QW]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10742,6 +10760,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
1074210760
SND_PCI_QUIRK(0x17aa, 0x38f9, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
1074310761
SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
1074410762
SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
10763+
SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),
1074510764
SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
1074610765
SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
1074710766
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
@@ -10994,6 +11013,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
1099411013
{.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},
1099511014
{.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},
1099611015
{.id = ALC285_FIXUP_HP_GPIO_AMP_INIT, .name = "alc285-hp-amp-init"},
11016+
{.id = ALC236_FIXUP_LENOVO_INV_DMIC, .name = "alc236-fixup-lenovo-inv-mic"},
1099711017
{}
1099811018
};
1099911019
#define ALC225_STANDARD_PINS \

‎sound/soc/amd/yc/acp6x-mach.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
353353
DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 C7VF"),
354354
}
355355
},
356+
{
357+
.driver_data = &acp6x_card,
358+
.matches = {
359+
DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),
360+
DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 17 D7VEK"),
361+
}
362+
},
356363
{
357364
.driver_data = &acp6x_card,
358365
.matches = {

‎sound/soc/codecs/chv3-codec.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ static const struct of_device_id chv3_codec_of_match[] = {
2626
{ .compatible = "google,chv3-codec", },
2727
{ }
2828
};
29+
MODULE_DEVICE_TABLE(of, chv3_codec_of_match);
2930

3031
static struct platform_driver chv3_codec_platform_driver = {
3132
.driver = {

‎sound/soc/codecs/lpass-va-macro.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,13 @@ struct va_macro {
228228
struct va_macro_data {
229229
bool has_swr_master;
230230
bool has_npl_clk;
231+
int version;
231232
};
232233

233234
static const struct va_macro_data sm8250_va_data = {
234235
.has_swr_master = false,
235236
.has_npl_clk = false,
237+
.version = LPASS_CODEC_VERSION_1_0,
236238
};
237239

238240
static const struct va_macro_data sm8450_va_data = {
@@ -1587,7 +1589,14 @@ static int va_macro_probe(struct platform_device *pdev)
15871589
goto err_npl;
15881590
}
15891591

1590-
va_macro_set_lpass_codec_version(va);
1592+
/**
1593+
* old version of codecs do not have a reliable way to determine the
1594+
* version from registers, get them from soc specific data
1595+
*/
1596+
if (data->version)
1597+
lpass_macro_set_codec_version(data->version);
1598+
else /* read version from register */
1599+
va_macro_set_lpass_codec_version(va);
15911600

15921601
if (va->has_swr_master) {
15931602
/* Set default CLK div to 1 */

‎sound/soc/codecs/tda7419.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@ static const struct of_device_id tda7419_of_match[] = {
623623
{ .compatible = "st,tda7419" },
624624
{ },
625625
};
626+
MODULE_DEVICE_TABLE(of, tda7419_of_match);
626627

627628
static struct i2c_driver tda7419_driver = {
628629
.driver = {

‎sound/soc/google/chv3-i2s.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ static const struct of_device_id chv3_i2s_of_match[] = {
322322
{ .compatible = "google,chv3-i2s" },
323323
{},
324324
};
325+
MODULE_DEVICE_TABLE(of, chv3_i2s_of_match);
325326

326327
static struct platform_driver chv3_i2s_driver = {
327328
.probe = chv3_i2s_probe,

0 commit comments

Comments
 (0)