From patchwork Mon Jul 13 20:18:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 494698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 8581314076A; Tue, 14 Jul 2015 06:19:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZEkCX-0003br-8t; Mon, 13 Jul 2015 20:19:45 +0000 Received: from mail-oi0-f41.google.com ([209.85.218.41]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZEkCR-0003bj-Nu for kernel-team@lists.ubuntu.com; Mon, 13 Jul 2015 20:19:39 +0000 Received: by oige126 with SMTP id e126so3711167oig.0 for ; Mon, 13 Jul 2015 13:19:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=F1J2K6A/8UHZVHx+hOYLsJbUZLEYqacr8mSBnDDzN1c=; b=H8Q6UG9jawJZEi1DLUvCOWfq+IJ/7cJ5CCgeyAfKYFUrtccNCiPnNBkmBg90NLJ/Cw AKaklcjIBPuIaL121ppXeXTvh4YXGOxdFHNuPBOaaBuVD0NefL1RWFNQnmMxrLah41If ftwBfv6jmGSvmF2+9/DSCa+tFLLS+hfF6NQ+sdPvrCs+3xzgRKlP81dr3p6MwZCH/NMG 8bh+MkyHtJEPksTMWBNgQeeKul4OAftac1I+IQw4NyeMYGK/mIEJ7/mHirrg6Y9nD7rP cIlWtz8WQ4pYx37tlGGwm2AB2TBkvKm/DXMP2i4X/qtbijWZtAInwP8vg6tDGHQ24/Cf iuuA== X-Gm-Message-State: ALoCoQmzzsk9ppjRTFv2ItB//FH545lDP5rYzDC0eYuxMOXDH+OWR79sqmCOXlSszCIWdRfBpWyr X-Received: by 10.202.181.11 with SMTP id e11mr30667490oif.107.1436818779189; Mon, 13 Jul 2015 13:19:39 -0700 (PDT) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id k191sm889945oig.18.2015.07.13.13.19.37 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 Jul 2015 13:19:38 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH][wily master-next] ALSA: hda - restore the MIC FIXUP for some Dell machines Date: Mon, 13 Jul 2015 15:18:41 -0500 Message-Id: <1436818721-119538-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Hui Wang 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 Cc: # v4.1 Signed-off-by: Takashi Iwai (cherry picked from commit 831bfdf9520e389357cfeee42a6174a73ce7bdb7) BugLink: http://bugs.launchpad.net/bugs/1473560 Signed-off-by: Seth Forshee --- 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),