Skip to content

Commit 7cd3c8c

Browse files
tiwaitiwai
committed
Merge branch 'for-linus' into for-next
Synch HD-audio changes landed in 6.16-rc7. Mostly for file rename tracking. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2 parents f261196 + 9744ede commit 7cd3c8c

5 files changed

Lines changed: 51 additions & 3 deletions

File tree

‎sound/hda/codecs/realtek/alc269.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6400,6 +6400,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
64006400
SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),
64016401
SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
64026402
SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),
6403+
SND_PCI_QUIRK(0x103c, 0x87cc, "HP Pavilion 15-eg0xxx", ALC287_FIXUP_HP_GPIO_LED),
64036404
SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
64046405
SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
64056406
SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
@@ -6478,6 +6479,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
64786479
SND_PCI_QUIRK(0x103c, 0x8a2e, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
64796480
SND_PCI_QUIRK(0x103c, 0x8a30, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
64806481
SND_PCI_QUIRK(0x103c, 0x8a31, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
6482+
SND_PCI_QUIRK(0x103c, 0x8a4f, "HP Victus 15-fa0xxx (MB 8A4F)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
64816483
SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),
64826484
SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
64836485
SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
542542
DMI_MATCH(DMI_PRODUCT_NAME, "OMEN by HP Gaming Laptop 16z-n000"),
543543
}
544544
},
545+
{
546+
.driver_data = &acp6x_card,
547+
.matches = {
548+
DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
549+
DMI_MATCH(DMI_PRODUCT_NAME, "Victus by HP Gaming Laptop 15-fb1xxx"),
550+
}
551+
},
545552
{
546553
.driver_data = &acp6x_card,
547554
.matches = {
@@ -591,6 +598,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
591598
DMI_MATCH(DMI_BOARD_NAME, "8A7F"),
592599
}
593600
},
601+
{
602+
.driver_data = &acp6x_card,
603+
.matches = {
604+
DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
605+
DMI_MATCH(DMI_BOARD_NAME, "8A81"),
606+
}
607+
},
594608
{
595609
.driver_data = &acp6x_card,
596610
.matches = {

‎sound/soc/codecs/rt5660.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,14 +1315,17 @@ static int rt5660_i2c_probe(struct i2c_client *i2c)
13151315
regmap_update_bits(rt5660->regmap, RT5660_GPIO_CTRL1,
13161316
RT5660_GP1_PIN_MASK, RT5660_GP1_PIN_DMIC1_SCL);
13171317

1318-
if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_GPIO2)
1318+
if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_GPIO2) {
13191319
regmap_update_bits(rt5660->regmap, RT5660_DMIC_CTRL1,
13201320
RT5660_SEL_DMIC_DATA_MASK,
13211321
RT5660_SEL_DMIC_DATA_GPIO2);
1322-
else if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_IN1P)
1322+
regmap_update_bits(rt5660->regmap, RT5660_GPIO_CTRL1,
1323+
RT5660_GP2_PIN_MASK, RT5660_GP2_PIN_DMIC1_SDA);
1324+
} else if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_IN1P) {
13231325
regmap_update_bits(rt5660->regmap, RT5660_DMIC_CTRL1,
13241326
RT5660_SEL_DMIC_DATA_MASK,
13251327
RT5660_SEL_DMIC_DATA_IN1P);
1328+
}
13261329
}
13271330

13281331
return devm_snd_soc_register_component(&i2c->dev,

‎sound/soc/intel/boards/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ menuconfig SND_SOC_INTEL_MACH
1111
kernel: saying N will just cause the configurator to skip all
1212
the questions about Intel ASoC machine drivers.
1313

14-
if SND_SOC_INTEL_MACH
14+
if SND_SOC_INTEL_MACH && (SND_SOC_SOF_INTEL_COMMON || !SND_SOC_SOF_INTEL_COMMON)
1515

1616
config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES
1717
bool "Use more user friendly long card names"

‎sound/soc/intel/common/soc-acpi-intel-arl-match.c‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,15 @@ static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {
238238
}
239239
};
240240

241+
static const struct snd_soc_acpi_adr_device rt1316_3_single_adr[] = {
242+
{
243+
.adr = 0x000330025D131601ull,
244+
.num_endpoints = 1,
245+
.endpoints = &single_endpoint,
246+
.name_prefix = "rt1316-1"
247+
}
248+
};
249+
241250
static const struct snd_soc_acpi_adr_device rt1320_2_single_adr[] = {
242251
{
243252
.adr = 0x000230025D132001ull,
@@ -368,6 +377,20 @@ static const struct snd_soc_acpi_link_adr arl_sdca_rvp[] = {
368377
{}
369378
};
370379

380+
static const struct snd_soc_acpi_link_adr arl_rt711_l0_rt1316_l3[] = {
381+
{
382+
.mask = BIT(0),
383+
.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),
384+
.adr_d = rt711_sdca_0_adr,
385+
},
386+
{
387+
.mask = BIT(3),
388+
.num_adr = ARRAY_SIZE(rt1316_3_single_adr),
389+
.adr_d = rt1316_3_single_adr,
390+
},
391+
{}
392+
};
393+
371394
static const struct snd_soc_acpi_link_adr arl_rt722_l0_rt1320_l2[] = {
372395
{
373396
.mask = BIT(0),
@@ -481,6 +504,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
481504
.sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
482505
.get_function_tplg_files = sof_sdw_get_tplg_files,
483506
},
507+
{
508+
.link_mask = BIT(0) | BIT(3),
509+
.links = arl_rt711_l0_rt1316_l3,
510+
.drv_name = "sof_sdw",
511+
.sof_tplg_filename = "sof-arl-rt711-l0-rt1316-l3.tplg",
512+
},
484513
{
485514
.link_mask = 0x1, /* link0 required */
486515
.links = arl_rvp,

0 commit comments

Comments
 (0)