Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Here are a few last-minute fixes for 5.0.
The most significant one is the OF-node refcount fix for ASoC
simple-card, which could be triggered on many boards. Another fix for
ASoC core is for the error handling in topology, while others are
device-specific fixes for Samsung and HD-audio"
* tag 'sound-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: simple-card: fixup refcount_t underflow
ASoC: topology: free created components in tplg load error
ALSA: hda/realtek: Disable PC beep in passthrough on alc285
ALSA: hda/realtek - Headset microphone and internal speaker support for System76 oryp5
ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI
+56
-4
+41
-1
sound/pci/hda/patch_realtek.c
+41
-1
sound/pci/hda/patch_realtek.c
···
1855
1855
ALC887_FIXUP_BASS_CHMAP,
1856
1856
ALC1220_FIXUP_GB_DUAL_CODECS,
1857
1857
ALC1220_FIXUP_CLEVO_P950,
1858
+
ALC1220_FIXUP_SYSTEM76_ORYP5,
1859
+
ALC1220_FIXUP_SYSTEM76_ORYP5_PINS,
1858
1860
};
1859
1861
1860
1862
static void alc889_fixup_coef(struct hda_codec *codec,
···
2056
2054
*/
2057
2055
snd_hda_override_conn_list(codec, 0x14, 1, conn1);
2058
2056
snd_hda_override_conn_list(codec, 0x1b, 1, conn1);
2057
+
}
2058
+
2059
+
static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,
2060
+
const struct hda_fixup *fix, int action);
2061
+
2062
+
static void alc1220_fixup_system76_oryp5(struct hda_codec *codec,
2063
+
const struct hda_fixup *fix,
2064
+
int action)
2065
+
{
2066
+
alc1220_fixup_clevo_p950(codec, fix, action);
2067
+
alc_fixup_headset_mode_no_hp_mic(codec, fix, action);
2059
2068
}
2060
2069
2061
2070
static const struct hda_fixup alc882_fixups[] = {
···
2313
2300
.type = HDA_FIXUP_FUNC,
2314
2301
.v.func = alc1220_fixup_clevo_p950,
2315
2302
},
2303
+
[ALC1220_FIXUP_SYSTEM76_ORYP5] = {
2304
+
.type = HDA_FIXUP_FUNC,
2305
+
.v.func = alc1220_fixup_system76_oryp5,
2306
+
},
2307
+
[ALC1220_FIXUP_SYSTEM76_ORYP5_PINS] = {
2308
+
.type = HDA_FIXUP_PINS,
2309
+
.v.pins = (const struct hda_pintbl[]) {
2310
+
{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
2311
+
{}
2312
+
},
2313
+
.chained = true,
2314
+
.chain_id = ALC1220_FIXUP_SYSTEM76_ORYP5,
2315
+
},
2316
2316
};
2317
2317
2318
2318
static const struct snd_pci_quirk alc882_fixup_tbl[] = {
···
2402
2376
SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950),
2403
2377
SND_PCI_QUIRK(0x1558, 0x95e1, "Clevo P95xER", ALC1220_FIXUP_CLEVO_P950),
2404
2378
SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950),
2379
+
SND_PCI_QUIRK(0x1558, 0x96e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_SYSTEM76_ORYP5_PINS),
2380
+
SND_PCI_QUIRK(0x1558, 0x97e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_SYSTEM76_ORYP5_PINS),
2405
2381
SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
2406
2382
SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
2407
2383
SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),
···
5660
5632
ALC294_FIXUP_ASUS_SPK,
5661
5633
ALC225_FIXUP_HEADSET_JACK,
5662
5634
ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
5635
+
ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,
5663
5636
};
5664
5637
5665
5638
static const struct hda_fixup alc269_fixups[] = {
···
6616
6587
.chained = true,
6617
6588
.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
6618
6589
},
6590
+
[ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE] = {
6591
+
.type = HDA_FIXUP_VERBS,
6592
+
.v.verbs = (const struct hda_verb[]) {
6593
+
/* Disable PCBEEP-IN passthrough */
6594
+
{ 0x20, AC_VERB_SET_COEF_INDEX, 0x36 },
6595
+
{ 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 },
6596
+
{ }
6597
+
},
6598
+
.chained = true,
6599
+
.chain_id = ALC285_FIXUP_LENOVO_HEADPHONE_NOISE
6600
+
},
6619
6601
};
6620
6602
6621
6603
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
···
7312
7272
{0x12, 0x90a60130},
7313
7273
{0x19, 0x03a11020},
7314
7274
{0x21, 0x0321101f}),
7315
-
SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,
7275
+
SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,
7316
7276
{0x12, 0x90a60130},
7317
7277
{0x14, 0x90170110},
7318
7278
{0x19, 0x04a11040},
+1
-1
sound/soc/generic/simple-card.c
+1
-1
sound/soc/generic/simple-card.c
+7
-1
sound/soc/samsung/i2s.c
+7
-1
sound/soc/samsung/i2s.c
···
604
604
unsigned int fmt)
605
605
{
606
606
struct i2s_dai *i2s = to_info(dai);
607
+
struct i2s_dai *other = get_other_dai(i2s);
607
608
int lrp_shift, sdf_shift, sdf_mask, lrp_rlow, mod_slave;
608
609
u32 mod, tmp = 0;
609
610
unsigned long flags;
···
662
661
* CLK_I2S_RCLK_SRC clock is not exposed so we ensure any
663
662
* clock configuration assigned in DT is not overwritten.
664
663
*/
665
-
if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL)
664
+
if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL &&
665
+
other->clk_data.clks == NULL)
666
666
i2s_set_sysclk(dai, SAMSUNG_I2S_RCLKSRC_0,
667
667
0, SND_SOC_CLOCK_IN);
668
668
break;
···
701
699
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
702
700
{
703
701
struct i2s_dai *i2s = to_info(dai);
702
+
struct i2s_dai *other = get_other_dai(i2s);
704
703
u32 mod, mask = 0, val = 0;
705
704
struct clk *rclksrc;
706
705
unsigned long flags;
···
787
784
i2s->frmclk = params_rate(params);
788
785
789
786
rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC];
787
+
if (!rclksrc || IS_ERR(rclksrc))
788
+
rclksrc = other->clk_table[CLK_I2S_RCLK_SRC];
789
+
790
790
if (rclksrc && !IS_ERR(rclksrc))
791
791
i2s->rclk_srcrate = clk_get_rate(rclksrc);
792
792
+7
-1
sound/soc/soc-topology.c
+7
-1
sound/soc/soc-topology.c
···
2487
2487
struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id)
2488
2488
{
2489
2489
struct soc_tplg tplg;
2490
+
int ret;
2490
2491
2491
2492
/* setup parsing context */
2492
2493
memset(&tplg, 0, sizeof(tplg));
···
2501
2500
tplg.bytes_ext_ops = ops->bytes_ext_ops;
2502
2501
tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count;
2503
2502
2504
-
return soc_tplg_load(&tplg);
2503
+
ret = soc_tplg_load(&tplg);
2504
+
/* free the created components if fail to load topology */
2505
+
if (ret)
2506
+
snd_soc_tplg_component_remove(comp, SND_SOC_TPLG_INDEX_ALL);
2507
+
2508
+
return ret;
2505
2509
}
2506
2510
EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load);
2507
2511