mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
sound fixes for 4.1-final
Nothing looks scary, just a few usual HD-audio regression fixes and fixup, in addition to a minor Kconfig dependency fix for the old MIPS drivers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVhAJbAAoJEGwxgFQ9KSmk46UP/0K9YGpUANqAoNdINPmLm6ug VECymygbOVLBR7lDooBKxSPfDYH3jXwOcVYm9cBF2tgIpuaS3qgq6RYr+4pKGMQM vW2VN0742Ag78X6+YJ70Tw7IbP0pHTvpoNvzYvOpfxhx2ebcF3Zw8Z65BLQtMc16 n+bYqgc8WeDc9RhnqfziVORD2CwXkATYiGhl1yHVrSAs9V75UKTFwCbV7fVoWcHU DKbrkH+2FzWpdWraL01HAQ/z5bGECtww3khFvmPPFnxLcUF6C2bzGTc6OCcduHpX NcwvL+NbP++tEAbw9sQiuuWhu2oRvFLhPrmmlN2ngHLVtCyPb5TEL+si6qLvtuRx qmlP0Uco2bd5Ypb8SF/mJaoWRBD+AW+mhfF5n81+XrNrQRGZcV6LGTdqBKKag9yA p7VX8/CpK4DLn5GggPAMMcO2SDBlwI66ivozGEKEFLYODoFZcDDZcH4dhafW7RCA sZPkr8hNEghJr5V28orKFm1ogy6bRMsnUWxMuekJaR6Ux6mTjDZqM2LJRPsZaIu4 ApCcHi8KVWBV3Io5iU518/+ylobe5heg5lOl8Y1UYGFnfc0QePezzHvryKa7XaB/ xsCWe+qXaG4s1jZzmrqbryNXIvzfjaZ3SUGJfzFdTrbn5J+JcVKrUEtFZR4L3pAg t+d8KJaKLCqajWyuDhlj =KSPF -----END PGP SIGNATURE----- Merge tag 'sound-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "Nothing looks scary, just a few usual HD-audio regression fixes and fixup, in addition to a minor Kconfig dependency fix for the old MIPS drivers" * tag 'sound-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Fix unused label skip_i915 ALSA: hda - Fix noisy outputs on Dell XPS13 (2015 model) ALSA: mips: let SND_SGI_O2 select SND_PCM ALSA: hda - Fix audio crackles on Dell Latitude E7x40 ALSA: hda - adding a DAC/pin preference map for a HP Envy TS machine
This commit is contained in:
Linus Torvalds
commit
9a10758c44
@ -12,12 +12,14 @@ if SND_MIPS
|
||||
config SND_SGI_O2
|
||||
tristate "SGI O2 Audio"
|
||||
depends on SGI_IP32
|
||||
select SND_PCM
|
||||
help
|
||||
Sound support for the SGI O2 Workstation.
|
||||
|
||||
config SND_SGI_HAL2
|
||||
tristate "SGI HAL2 Audio"
|
||||
depends on SGI_HAS_HAL2
|
||||
select SND_PCM
|
||||
help
|
||||
Sound support for the SGI Indy and Indigo2 Workstation.
|
||||
|
||||
|
||||
@ -1879,7 +1879,9 @@ static int azx_probe_continue(struct azx *chip)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SND_HDA_I915
|
||||
skip_i915:
|
||||
#endif
|
||||
err = azx_first_init(chip);
|
||||
if (err < 0)
|
||||
goto out_free;
|
||||
|
||||
@ -4515,6 +4515,8 @@ enum {
|
||||
ALC288_FIXUP_DELL_HEADSET_MODE,
|
||||
ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
|
||||
ALC288_FIXUP_DELL_XPS_13_GPIO6,
|
||||
ALC292_FIXUP_DELL_E7X,
|
||||
ALC292_FIXUP_DISABLE_AAMIX,
|
||||
};
|
||||
|
||||
static const struct hda_fixup alc269_fixups[] = {
|
||||
@ -5037,6 +5039,16 @@ static const struct hda_fixup alc269_fixups[] = {
|
||||
.chained = true,
|
||||
.chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE
|
||||
},
|
||||
[ALC292_FIXUP_DISABLE_AAMIX] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc_fixup_disable_aamix,
|
||||
},
|
||||
[ALC292_FIXUP_DELL_E7X] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = alc_fixup_dell_xps13,
|
||||
.chained = true,
|
||||
.chain_id = ALC292_FIXUP_DISABLE_AAMIX
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
@ -5049,6 +5061,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),
|
||||
SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),
|
||||
SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
|
||||
SND_PCI_QUIRK(0x1028, 0x05ca, "Dell Latitude E7240", ALC292_FIXUP_DELL_E7X),
|
||||
SND_PCI_QUIRK(0x1028, 0x05cb, "Dell Latitude E7440", ALC292_FIXUP_DELL_E7X),
|
||||
SND_PCI_QUIRK(0x1028, 0x05da, "Dell Vostro 5460", ALC290_FIXUP_SUBWOOFER),
|
||||
SND_PCI_QUIRK(0x1028, 0x05f4, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x05f5, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
@ -5058,6 +5072,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK),
|
||||
SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x0665, "Dell XPS 13", ALC292_FIXUP_DELL_E7X),
|
||||
SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||
@ -5637,8 +5652,7 @@ static int patch_alc269(struct hda_codec *codec)
|
||||
|
||||
spec = codec->spec;
|
||||
spec->gen.shared_mic_vref_pin = 0x18;
|
||||
if (codec->core.vendor_id != 0x10ec0292)
|
||||
codec->power_save_node = 1;
|
||||
codec->power_save_node = 1;
|
||||
|
||||
snd_hda_pick_fixup(codec, alc269_fixup_models,
|
||||
alc269_fixup_tbl, alc269_fixups);
|
||||
|
||||
@ -100,6 +100,7 @@ enum {
|
||||
STAC_HP_ENVY_BASS,
|
||||
STAC_HP_BNB13_EQ,
|
||||
STAC_HP_ENVY_TS_BASS,
|
||||
STAC_HP_ENVY_TS_DAC_BIND,
|
||||
STAC_92HD83XXX_GPIO10_EAPD,
|
||||
STAC_92HD83XXX_MODELS
|
||||
};
|
||||
@ -2171,6 +2172,22 @@ static void stac92hd83xxx_fixup_gpio10_eapd(struct hda_codec *codec,
|
||||
spec->eapd_switch = 0;
|
||||
}
|
||||
|
||||
static void hp_envy_ts_fixup_dac_bind(struct hda_codec *codec,
|
||||
const struct hda_fixup *fix,
|
||||
int action)
|
||||
{
|
||||
struct sigmatel_spec *spec = codec->spec;
|
||||
static hda_nid_t preferred_pairs[] = {
|
||||
0xd, 0x13,
|
||||
0
|
||||
};
|
||||
|
||||
if (action != HDA_FIXUP_ACT_PRE_PROBE)
|
||||
return;
|
||||
|
||||
spec->gen.preferred_dacs = preferred_pairs;
|
||||
}
|
||||
|
||||
static const struct hda_verb hp_bnb13_eq_verbs[] = {
|
||||
/* 44.1KHz base */
|
||||
{ 0x22, 0x7A6, 0x3E },
|
||||
@ -2686,6 +2703,12 @@ static const struct hda_fixup stac92hd83xxx_fixups[] = {
|
||||
{}
|
||||
},
|
||||
},
|
||||
[STAC_HP_ENVY_TS_DAC_BIND] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = hp_envy_ts_fixup_dac_bind,
|
||||
.chained = true,
|
||||
.chain_id = STAC_HP_ENVY_TS_BASS,
|
||||
},
|
||||
[STAC_92HD83XXX_GPIO10_EAPD] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = stac92hd83xxx_fixup_gpio10_eapd,
|
||||
@ -2764,6 +2787,8 @@ static const struct snd_pci_quirk stac92hd83xxx_fixup_tbl[] = {
|
||||
"HP bNB13", STAC_HP_BNB13_EQ),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x190e,
|
||||
"HP ENVY TS", STAC_HP_ENVY_TS_BASS),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1967,
|
||||
"HP ENVY TS", STAC_HP_ENVY_TS_DAC_BIND),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1940,
|
||||
"HP bNB13", STAC_HP_BNB13_EQ),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1941,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user