From patchwork Tue Sep 18 18:33:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor McAdams X-Patchwork-Id: 10604787 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 005396CB for ; Tue, 18 Sep 2018 18:45:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3A0D2B9AF for ; Tue, 18 Sep 2018 18:45:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D76932B9D6; Tue, 18 Sep 2018 18:45:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05D692BA25 for ; Tue, 18 Sep 2018 18:45:49 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4465C267891; Tue, 18 Sep 2018 20:34:41 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E573C267896; Tue, 18 Sep 2018 20:34:38 +0200 (CEST) Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by alsa0.perex.cz (Postfix) with ESMTP id 55125267891 for ; Tue, 18 Sep 2018 20:34:34 +0200 (CEST) Received: by mail-qt0-f194.google.com with SMTP id m13-v6so2705886qth.1 for ; Tue, 18 Sep 2018 11:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rDZVJePVfJo2ljZeIe9wGOUwq18IZmhUECBVkgFtXkg=; b=KNzPCOu/k3c/MuFz39CMyBYWW8Lqy8dbOsolfGMVJxRnEVSMreL2zzqZ/pGx3eyynH av0e/a2af2LgiNJ8SbymVhXFg4AabnJSSM/qaJMGs29XbtZkXBI44cBDOnPJhViNBNxl LQxP1fG8Q5WTzhbehFH01HPdwbwpRNgx61TbeGH117y6MOwZI7Sezd7K3UOENzd2N+J8 Q5M+7yJdhW/0SjC7xBNDz07a4TLspFbfCMzdMIAMR0MTHvOGAR6MtMvVgdgyCnyadvcU sj7LPaMt0kvZ8zNN9lEJXOupR9gdfFIxdEkWaUaUBN7kW6DdGeJPjVEIN0jwrXQj4jqY TlFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rDZVJePVfJo2ljZeIe9wGOUwq18IZmhUECBVkgFtXkg=; b=MK+nE7I2DD1ZTpYULnINxnaCgVzLHOGZt5Wsyc/LxNl/PSA5BtOR7wqGwRjPydedtz OQZTFfnyzbLReQzjYB0cA3XBWnZ/eJTSVo2ad9PMzcwcu/F4Bksxv0ZCijGMO48ZTdQy XjReeAmjKy8w0+S4sAeNNDxXOOY2s1Qhs8pgETkPS8cPEUyNWZnVNIf57ffYJaKIhNH5 6HGRPzP9agg2WlRk4u9wwfr1ww7rzXa4atXg45ldgaeFv4ZSQEIXuofA8H6U3Kyt02SU kJPmPR4N32acn1Axtl8nME6RN5wcL2/yZVWL1baTHIYIv9aLe2TNE123h/C1IooLkL0I whyA== X-Gm-Message-State: APzg51BpZN2veywX10EvRgJ9JwMhaScSOldFnmtBrv0txFubO8DOqi71 9GQldAVNyIQzCrOk9/wyd+0= X-Google-Smtp-Source: ANB0VdZafyh65YbHmCFzHjANqECdL2sXU6kNpCamkJdLb1VgEJljiFRIyFQorAc4dVDH0sZw+G7row== X-Received: by 2002:a0c:becb:: with SMTP id f11-v6mr22609181qvj.217.1537295674387; Tue, 18 Sep 2018 11:34:34 -0700 (PDT) Received: from localhost.localdomain ([2605:a000:1316:4273:719d:df26:b0cf:931a]) by smtp.googlemail.com with ESMTPSA id m15-v6sm13819101qki.1.2018.09.18.11.34.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Sep 2018 11:34:34 -0700 (PDT) From: Connor McAdams To: Date: Tue, 18 Sep 2018 14:33:32 -0400 Message-Id: <1537295625-8082-5-git-send-email-conmanx360@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537295625-8082-1-git-send-email-conmanx360@gmail.com> References: <1537295625-8082-1-git-send-email-conmanx360@gmail.com> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Alastair Bridgewater , Takashi Iwai , conmanx360@gmail.com Subject: [alsa-devel] [PATCH 04/15] ALSA: hda/ca0132 - Set AE-5 bools and select mixer X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This patch sets the bool values for the AE-5, as well as selects the mixer it will use. Signed-off-by: Connor McAdams --- sound/pci/hda/patch_ca0132.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 5f53c71..7c870c4 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -7597,7 +7597,11 @@ static int ca0132_prepare_verbs(struct hda_codec *codec) struct ca0132_spec *spec = codec->spec; spec->chip_init_verbs = ca0132_init_verbs0; - if (spec->quirk == QUIRK_SBZ || spec->quirk == QUIRK_R3D) + /* + * Since desktop cards use pci_mmio, this can be used to determine + * whether or not to use these verbs instead of a separate bool. + */ + if (spec->use_pci_mmio) spec->desktop_init_verbs = ca0132_init_verbs1; spec->spec_init_verbs = kcalloc(NUM_SPEC_VERBS, sizeof(struct hda_verb), @@ -7671,6 +7675,10 @@ static int patch_ca0132(struct hda_codec *codec) spec->mixers[0] = r3di_mixer; snd_hda_codec_set_name(codec, "Recon3Di"); break; + case QUIRK_AE5: + spec->mixers[0] = desktop_mixer; + snd_hda_codec_set_name(codec, "Sound BlasterX AE-5"); + break; default: spec->mixers[0] = ca0132_mixer; break; @@ -7680,6 +7688,7 @@ static int patch_ca0132(struct hda_codec *codec) switch (spec->quirk) { case QUIRK_SBZ: case QUIRK_R3D: + case QUIRK_AE5: spec->use_alt_controls = true; spec->use_alt_functions = true; spec->use_pci_mmio = true;