Applied: [PATCH][wily master-next] ALSA: hda - restore the MIC FIXUP for some Dell machines

[Leann Ogasawara]

Applied to wily master-next.

Thanks,
Leann

On 07/13/2015 01:18 PM, Seth Forshee wrote:
> From: Hui Wang <hui.wang at canonical.com>
> 
> Those FIXUPs were applied to the machines through pin quirks, but
> recently the PCI_QUIRK makes them can't apply to the machines.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=99851
> Signed-off-by: Hui Wang <hui.wang at canonical.com>
> Cc: <stable at vger.kernel.org> # v4.1
> Signed-off-by: Takashi Iwai <tiwai at suse.de>
> (cherry picked from commit 831bfdf9520e389357cfeee42a6174a73ce7bdb7)
> BugLink: http://bugs.launchpad.net/bugs/1473560
> Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 6d01045..f3d9eb5 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -4515,6 +4515,8 @@ enum {
>  	ALC288_FIXUP_DELL_HEADSET_MODE,
>  	ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
>  	ALC288_FIXUP_DELL_XPS_13_GPIO6,
> +	ALC288_FIXUP_DELL_XPS_13,
> +	ALC288_FIXUP_DISABLE_AAMIX,
>  	ALC292_FIXUP_DELL_E7X,
>  	ALC292_FIXUP_DISABLE_AAMIX,
>  };
> @@ -5039,9 +5041,23 @@ static const struct hda_fixup alc269_fixups[] = {
>  		.chained = true,
>  		.chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE
>  	},
> +	[ALC288_FIXUP_DISABLE_AAMIX] = {
> +		.type = HDA_FIXUP_FUNC,
> +		.v.func = alc_fixup_disable_aamix,
> +		.chained = true,
> +		.chain_id = ALC288_FIXUP_DELL_XPS_13_GPIO6
> +	},
> +	[ALC288_FIXUP_DELL_XPS_13] = {
> +		.type = HDA_FIXUP_FUNC,
> +		.v.func = alc_fixup_dell_xps13,
> +		.chained = true,
> +		.chain_id = ALC288_FIXUP_DISABLE_AAMIX
> +	},
>  	[ALC292_FIXUP_DISABLE_AAMIX] = {
>  		.type = HDA_FIXUP_FUNC,
>  		.v.func = alc_fixup_disable_aamix,
> +		.chained = true,
> +		.chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE
>  	},
>  	[ALC292_FIXUP_DELL_E7X] = {
>  		.type = HDA_FIXUP_FUNC,
> @@ -5072,7 +5088,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, 0x0665, "Dell XPS 13", ALC288_FIXUP_DELL_XPS_13),
>  	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),
>