Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp5568813imm; Tue, 18 Sep 2018 11:36:46 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaYGpQrb2RBrrgF7ApuVfKfkj+4RiDzxyXHAP372zAdYvpIz4Cxu0HOD837iDIoKndUFdF8 X-Received: by 2002:a63:dc17:: with SMTP id s23-v6mr29089066pgg.40.1537295806182; Tue, 18 Sep 2018 11:36:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537295806; cv=none; d=google.com; s=arc-20160816; b=FnLkMvcslnElHrfNYY3jbMW37R3/IwF88FogAwOAJNnDN1O540eGRDUf25LhamEwKM uqm6TPqiIhvipvoM9HWjFU2YyIHXJ04fcHfCVfpDzrXbpczAWvInPDcCtIqrjpvmwNoR ZPC9YasKLlRlB96/7/rUeCp+S4aHBLOGtJmDb6ddy806ibUNK0mMXKyr+he40eJet6Y0 OpRc1q+hjeRBmHMpKG7VpP1wy84TmPihM5EfoGfxt4FZBCWsdi+cbyNr58E29XJ6ztDF gTyJhN+eUA20ai2I6732svl10KylwH20T2T5fLjEAKjY72CiGK4fJIS2z+G9ism8Zdaa +nVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:references:in-reply-to:message-id:date :subject:cc:from:dkim-signature; bh=zWKZg1xgNMWPuWsY7NHV8trP0IBkfp34sPol3/qoslg=; b=gprUtzQxamrcIXHSACy7eV43A1OnDnLeB3Oxa6rqkKgD3sSgKtLagMy+qEg2myiyCC p7xpoe6vwbSE1xau1PLDvAQO7hCMIKrE0TPNotb4/oZb/198Q0grb7kHvcx7H55mNdTx FZBWpSzLHsJvMN7JhrVNTF3tBqeq/lDU3phBnY0aeJijVxVmBtgrNUXNxqsflaMXjqNz Cp8nyUJq1UMc4UYp3vnNEBZQGG7adkdAVIntmuEP4zmZ89ojPfCLAvt/DAwJmam8F9iZ 1IvNIHkUuV0Nm1Iql8zv0JntzwI51QWAnvp4QzZAY8r4ynKeaELhPqvxMeLGwxsqnmOI VBXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=bDGT+Njq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si18535197plk.379.2018.09.18.11.36.27; Tue, 18 Sep 2018 11:36:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=bDGT+Njq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730696AbeISAIq (ORCPT + 99 others); Tue, 18 Sep 2018 20:08:46 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:37096 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730666AbeISAIp (ORCPT ); Tue, 18 Sep 2018 20:08:45 -0400 Received: by mail-qt0-f196.google.com with SMTP id n6-v6so2686951qtl.4 for ; Tue, 18 Sep 2018 11:34:54 -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=zWKZg1xgNMWPuWsY7NHV8trP0IBkfp34sPol3/qoslg=; b=bDGT+Njqzu1mME0baZp/QPgQbSxvLieN7z/5HqxDjSTDozjN4iAGjaObiScYyC1CHh 4aTeojZkyRvDloG3wTxWF8Pklu3Cl/JC0Evw2WUGy6sv2+0Pe92cMwn8kC0pDXOAO8B1 hpn2KHPbdz2HJslmWw74LSM4tEhkEs5iyeHq4jVKV3iGcOl7fbTv78/AFIa4lGjTlP3K 4QEH6Z9Oe5cSk/nlqdYxA7+0RsC4vdmLEEMgw+1/Vm/IzuIq/bn2gD7sNAlWlDq8xU0U WgOq6R8lPmImucRjo93p5yZ8xmPFRkH57cmxdEdSo+X59MTT26wV5Zvz8CgFzgQenjit w3Lw== 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=zWKZg1xgNMWPuWsY7NHV8trP0IBkfp34sPol3/qoslg=; b=E+NfUF1F+3DM68Lw2M9vAJjuBu3/TuxG47kfgH7Z9i3p4vzePbOyn89fay8ZvxO33O yRbDlpmk6LudOt4fOfIpVa2SQwaShwtEdy9KQZGhbkl+ahEN4+ebMhtBOhZ3d5sL1SzT SWg84J7S1k84N24aEZ0XqZQrffj+7aw1VuIVndNRf4rz1vOvyBIoazJD6ML9H3sebs6u J2IME1M9tAMuY9ZSQ4+EPjRrI7Zw7tgi7Uw9OeDxj1zMZKeFJ9ChYTkYCCnclQUjVe3H au3exImL3gVZ1RwrktaQlj0zSv2YpXBUzKUkKPqqfZZN9O1SrNyKqm06wuunoz/vJ9fE DIKQ== X-Gm-Message-State: APzg51CsLfEhbPx1BtISHD5ufSeGiz8znlvAav7lfLNmkZA9EN18qr/X 7v6kL3imB/5KazMm8aKVPQw= X-Received: by 2002:a0c:acf3:: with SMTP id n48-v6mr22411103qvc.227.1537295693855; Tue, 18 Sep 2018 11:34:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Sep 2018 11:34:53 -0700 (PDT) From: Connor McAdams Cc: conmanx360@gmail.com, Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto , Alastair Bridgewater , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/15] ALSA: hda/ca0132 - Add input selection commands for AE-5 Date: Tue, 18 Sep 2018 14:33:41 -0400 Message-Id: <1537295625-8082-14-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> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds the input selection commands for the Sound BlasterX AE-5. Signed-off-by: Connor McAdams --- sound/pci/hda/patch_ca0132.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 364c3fe..ff80832 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -4523,6 +4523,10 @@ static int ca0132_alt_select_in(struct hda_codec *codec) r3di_gpio_mic_set(codec, R3DI_REAR_MIC); tmp = FLOAT_ONE; break; + case QUIRK_AE5: + ca0113_mmio_command_set(codec, 0x48, 0x28, 0x00); + tmp = FLOAT_THREE; + break; default: tmp = FLOAT_ONE; break; @@ -4537,10 +4541,15 @@ static int ca0132_alt_select_in(struct hda_codec *codec) chipio_set_stream_control(codec, 0x03, 1); chipio_set_stream_control(codec, 0x04, 1); - - if (spec->quirk == QUIRK_SBZ) { + switch (spec->quirk) { + case QUIRK_SBZ: chipio_write(codec, 0x18B098, 0x0000000C); chipio_write(codec, 0x18B09C, 0x0000000C); + break; + case QUIRK_AE5: + chipio_write(codec, 0x18B098, 0x0000000C); + chipio_write(codec, 0x18B09C, 0x0000004C); + break; } ca0132_alt_mic_boost_set(codec, spec->mic_boost_enum_val); break; @@ -4554,6 +4563,9 @@ static int ca0132_alt_select_in(struct hda_codec *codec) case QUIRK_R3DI: r3di_gpio_mic_set(codec, R3DI_REAR_MIC); break; + case QUIRK_AE5: + ca0113_mmio_command_set(codec, 0x48, 0x28, 0x00); + break; } chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000); @@ -4564,11 +4576,13 @@ static int ca0132_alt_select_in(struct hda_codec *codec) tmp = FLOAT_ZERO; dspio_set_uint_param(codec, 0x80, 0x00, tmp); - if (spec->quirk == QUIRK_SBZ) { + switch (spec->quirk) { + case QUIRK_SBZ: + case QUIRK_AE5: chipio_write(codec, 0x18B098, 0x00000000); chipio_write(codec, 0x18B09C, 0x00000000); + break; } - chipio_set_stream_control(codec, 0x03, 1); chipio_set_stream_control(codec, 0x04, 1); break; @@ -4584,6 +4598,10 @@ static int ca0132_alt_select_in(struct hda_codec *codec) r3di_gpio_mic_set(codec, R3DI_FRONT_MIC); tmp = FLOAT_ONE; break; + case QUIRK_AE5: + ca0113_mmio_command_set(codec, 0x48, 0x28, 0x3f); + tmp = FLOAT_THREE; + break; default: tmp = FLOAT_ONE; break; @@ -4599,9 +4617,15 @@ static int ca0132_alt_select_in(struct hda_codec *codec) chipio_set_stream_control(codec, 0x03, 1); chipio_set_stream_control(codec, 0x04, 1); - if (spec->quirk == QUIRK_SBZ) { + switch (spec->quirk) { + case QUIRK_SBZ: chipio_write(codec, 0x18B098, 0x0000000C); chipio_write(codec, 0x18B09C, 0x000000CC); + break; + case QUIRK_AE5: + chipio_write(codec, 0x18B098, 0x0000000C); + chipio_write(codec, 0x18B09C, 0x0000004C); + break; } ca0132_alt_mic_boost_set(codec, spec->mic_boost_enum_val); break; @@ -4610,7 +4634,6 @@ static int ca0132_alt_select_in(struct hda_codec *codec) snd_hda_power_down_pm(codec); return 0; - } /* -- 2.7.4