History

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

Linus Torvalds committed 14 years ago

Commit c4470642 parents 8cd5c86 8de5d6f3 files · +20 −2Browse files

Unified · Split

3 files
  1. sound/pci/hda/patch_realtek.c +17 −0
  2. sound/pci/rme9652/hdspm.c +1 −0
  3. sound/soc/samsung/neo1973_wm8753.c +2 −2
sound/pci/hda/patch_realtek.c+17−0
@@ -2068,12 +2068,16 @@ static int alc_build_controls(struct hda_codec *codec) · 2067 unmodified lines
20682068 */
20692069
20702070 static void alc_init_special_input_src(struct hda_codec *codec);
2071+static int alc269_fill_coef(struct hda_codec *codec);
20712072
20722073 static int alc_init(struct hda_codec *codec)
20732074 {
20742075 struct alc_spec *spec = codec->spec;
20752076 unsigned int i;
20762077
2078+ if (codec->vendor_id == 0x10ec0269)
2079+ alc269_fill_coef(codec);
2080+
20772081 alc_fix_pll(codec);
20782082 alc_auto_init_amp(codec, spec->init_amp);
20792083
@@ -4367,6 +4371,7 @@ enum { · 2287 unmodified lines
43674371 ALC882_FIXUP_PB_M5210,
43684372 ALC882_FIXUP_ACER_ASPIRE_7736,
43694373 ALC882_FIXUP_ASUS_W90V,
4374+ ALC889_FIXUP_CD,
43704375 ALC889_FIXUP_VAIO_TT,
43714376 ALC888_FIXUP_EEE1601,
43724377 ALC882_FIXUP_EAPD,
@@ -4494,6 +4499,13 @@ static const struct alc_fixup alc882_fixups[] = { · 121 unmodified lines
44944499 { }
44954500 }
44964501 },
4502+ [ALC889_FIXUP_CD] = {
4503+ .type = ALC_FIXUP_PINS,
4504+ .v.pins = (const struct alc_pincfg[]) {
4505+ { 0x1c, 0x993301f0 }, /* CD */
4506+ { }
4507+ }
4508+ },
44974509 [ALC889_FIXUP_VAIO_TT] = {
44984510 .type = ALC_FIXUP_PINS,
44994511 .v.pins = (const struct alc_pincfg[]) {
@@ -4650,6 +4662,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { · 150 unmodified lines
46504662
46514663 SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),
46524664 SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
4665+ SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3", ALC889_FIXUP_CD),
46534666 SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
46544667 SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
46554668 SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
@@ -5467,8 +5480,12 @@ static const struct alc_model_fixup alc269_fixup_models[] = { · 811 unmodified lines
54675480
54685481 static int alc269_fill_coef(struct hda_codec *codec)
54695482 {
5483+ struct alc_spec *spec = codec->spec;
54705484 int val;
54715485
5486+ if (spec->codec_variant != ALC269_TYPE_ALC269VB)
5487+ return 0;
5488+
54725489 if ((alc_get_coef0(codec) & 0x00ff) < 0x015) {
54735490 alc_write_coef_idx(codec, 0xf, 0x960b);
54745491 alc_write_coef_idx(codec, 0xe, 0x8817);
sound/pci/rme9652/hdspm.c+1−0
@@ -6333,6 +6333,7 @@ static int __devinit snd_hdspm_create_hwdep(struct snd_card *card, · 6332 unmodified lines
63336333
63346334 hw->ops.open = snd_hdspm_hwdep_dummy_op;
63356335 hw->ops.ioctl = snd_hdspm_hwdep_ioctl;
6336+ hw->ops.ioctl_compat = snd_hdspm_hwdep_ioctl;
63366337 hw->ops.release = snd_hdspm_hwdep_dummy_op;
63376338
63386339 return 0;
sound/soc/samsung/neo1973_wm8753.c+2−2
@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { · 366 unmodified lines
367367 .platform_name = "samsung-audio",
368368 .cpu_dai_name = "s3c24xx-iis",
369369 .codec_dai_name = "wm8753-hifi",
370− .codec_name = "wm8753-codec.0-001a",
370+ .codec_name = "wm8753.0-001a",
371371 .init = neo1973_wm8753_init,
372372 .ops = &neo1973_hifi_ops,
373373 },
@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { · 2 unmodified lines
376376 .stream_name = "Voice",
377377 .cpu_dai_name = "dfbmcs320-pcm",
378378 .codec_dai_name = "wm8753-voice",
379− .codec_name = "wm8753-codec.0-001a",
379+ .codec_name = "wm8753.0-001a",
380380 .ops = &neo1973_voice_ops,
381381 },
382382 };