Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Nothing exciting here: just a few regression fixes for HD-audio and
ASoC, also the support of missing 32bit compat ioctl for HDSPM."
* tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hdspm - Provide ioctl_compat
ALSA: hda/realtek - Apply the coef-setup only to ALC269VB
ALSA: hda - add quirk to detect CD input on Gigabyte EP45-DS3
ASoC: neo1973: fix neo1973 wm8753 initialization
+20
-2
+17
sound/pci/hda/patch_realtek.c
+17
sound/pci/hda/patch_realtek.c
···
2068
2068
*/
2069
2069
2070
2070
static void alc_init_special_input_src(struct hda_codec *codec);
2071
+
static int alc269_fill_coef(struct hda_codec *codec);
2071
2072
2072
2073
static int alc_init(struct hda_codec *codec)
2073
2074
{
2074
2075
struct alc_spec *spec = codec->spec;
2075
2076
unsigned int i;
2077
+
2078
+
if (codec->vendor_id == 0x10ec0269)
2079
+
alc269_fill_coef(codec);
2076
2080
2077
2081
alc_fix_pll(codec);
2078
2082
alc_auto_init_amp(codec, spec->init_amp);
···
4371
4367
ALC882_FIXUP_PB_M5210,
4372
4368
ALC882_FIXUP_ACER_ASPIRE_7736,
4373
4369
ALC882_FIXUP_ASUS_W90V,
4370
+
ALC889_FIXUP_CD,
4374
4371
ALC889_FIXUP_VAIO_TT,
4375
4372
ALC888_FIXUP_EEE1601,
4376
4373
ALC882_FIXUP_EAPD,
···
4496
4491
.type = ALC_FIXUP_PINS,
4497
4492
.v.pins = (const struct alc_pincfg[]) {
4498
4493
{ 0x16, 0x99130110 }, /* fix sequence for CLFE */
4494
+
{ }
4495
+
}
4496
+
},
4497
+
[ALC889_FIXUP_CD] = {
4498
+
.type = ALC_FIXUP_PINS,
4499
+
.v.pins = (const struct alc_pincfg[]) {
4500
+
{ 0x1c, 0x993301f0 }, /* CD */
4499
4501
{ }
4500
4502
}
4501
4503
},
···
4662
4650
4663
4651
SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),
4664
4652
SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
4653
+
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3", ALC889_FIXUP_CD),
4665
4654
SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
4666
4655
SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
4667
4656
SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
···
5480
5467
5481
5468
static int alc269_fill_coef(struct hda_codec *codec)
5482
5469
{
5470
+
struct alc_spec *spec = codec->spec;
5483
5471
int val;
5472
+
5473
+
if (spec->codec_variant != ALC269_TYPE_ALC269VB)
5474
+
return 0;
5484
5475
5485
5476
if ((alc_get_coef0(codec) & 0x00ff) < 0x015) {
5486
5477
alc_write_coef_idx(codec, 0xf, 0x960b);
+1
sound/pci/rme9652/hdspm.c
+1
sound/pci/rme9652/hdspm.c
+2
-2
sound/soc/samsung/neo1973_wm8753.c
+2
-2
sound/soc/samsung/neo1973_wm8753.c
···
367
367
.platform_name = "samsung-audio",
368
368
.cpu_dai_name = "s3c24xx-iis",
369
369
.codec_dai_name = "wm8753-hifi",
370
-
.codec_name = "wm8753-codec.0-001a",
370
+
.codec_name = "wm8753.0-001a",
371
371
.init = neo1973_wm8753_init,
372
372
.ops = &neo1973_hifi_ops,
373
373
},
···
376
376
.stream_name = "Voice",
377
377
.cpu_dai_name = "dfbmcs320-pcm",
378
378
.codec_dai_name = "wm8753-voice",
379
-
.codec_name = "wm8753-codec.0-001a",
379
+
.codec_name = "wm8753.0-001a",
380
380
.ops = &neo1973_voice_ops,
381
381
},
382
382
};