Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp3162960pxa; Tue, 25 Aug 2020 13:14:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzpEIX05dslxgvVY6/Es1OKYA59xMSFZXUPhTrZN55eAmstYArFo/LjbgbATCdc0pIFrer X-Received: by 2002:a05:6402:2033:: with SMTP id ay19mr11813206edb.361.1598386457861; Tue, 25 Aug 2020 13:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598386457; cv=none; d=google.com; s=arc-20160816; b=aKui3ioxY//z4NBG1J4W7qdokwogHxfxS1SQWSROocmaIKfbEpEw65JUAQHzIewsCv u2mi64Pk4TxrvV6RlyzdF3uwEfzgmNHksOzjZSf1UQzwTVEGJf3lsj3dungGxzeb66xK ZUZRnFVU2QDksVFI79QtODH7B/TypWMMuWAXP4Oug1d44i44pYqm/0P6SCoV12NSV6VF VJRsAApXhrz4QdfUWLGpwMJDvcVzOdjmtM7huz0Vmb8OpDD5tiNqTPvgG1AdS8vFtyu+ sXfX7xYfpFP2x0nIkLBixsZK1I49WQOQTwaMed2+FaxNCbg/Qp/lkIACwRXg41Uct8KG aRKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=8ChaZ6nTOfS1bT+oUOP3MAm7zV3qo3G8NzOJnN+5Pbk=; b=BhP0PCzwwN02hYbz/JBrZJIyifb4m553vX8HuQvSNNjhMpGlirih8bMDdmU35Jqjom eSK+ua+JUEcPFOwDKdQyoliMEXbZjPIsgjv0g1dLJyrQo4187TIkD9HVtSP8W3QpbOMe +C3lcnkIBVoaM2+g7ckScrL0hwdvQXmXhpThlWue7RO/aqKzO1jD2bBvmE574M1Lmb7Z vVeEiV2dDQjNv67lQ4ejSCh94kpgKGUdyFEa1Ji24SEkwAwpIqG6c+Agi5BNU2Nw+3/b VZYStlsjJYwW8sossLLxQ/ueAWnfI70zxXpe+D1/FOhWanbusuotzxPFGpui5gbRH/q0 m9Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="D+0/zxem"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id v24si62446ejj.497.2020.08.25.13.13.54; Tue, 25 Aug 2020 13:14:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="D+0/zxem"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1727040AbgHYUMY (ORCPT + 99 others); Tue, 25 Aug 2020 16:12:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726806AbgHYULZ (ORCPT ); Tue, 25 Aug 2020 16:11:25 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80FDCC061757 for ; Tue, 25 Aug 2020 13:11:25 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id g26so12323557qka.3 for ; Tue, 25 Aug 2020 13:11:25 -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 :mime-version:content-transfer-encoding; bh=8ChaZ6nTOfS1bT+oUOP3MAm7zV3qo3G8NzOJnN+5Pbk=; b=D+0/zxemxo3Q1nuJ9+BA/yGCJgdp18sOmApPYRWiWAWNcWYrG1/TpkoNvchhrUEeJc UU2KYmnVK+tWybo7WNRZjn/pQSLgHOe9Of0XcCfe8nxWK8hWcTFBoB7dnbccu11g6wi3 WYNBygX7RslYzlCqr4Y1gFxg3ezzArQaaF3pFQFAbuoSoCXa5aJQA+VE9F3Y0+JOoXSm uPh9fYKcHTFikvU3Wf1J2kluuL9noyMBHTDTa/putZAWT4OERdkrt8raM286+d+5aO/b i4QbuT2W9ehv2uWtFH9TjaBzh/t+G+Vk1Ko6YPO2kflHevfAJl4TNmwcIszCuWyHCaod TO4w== 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:mime-version:content-transfer-encoding; bh=8ChaZ6nTOfS1bT+oUOP3MAm7zV3qo3G8NzOJnN+5Pbk=; b=Ku4fi4oLjLSL8uddBJYAvgGtx3xM/FP/ZR7jHLUaKo05L9tnmiRAGfYDxXPDbOTMl4 I+Qjdg0BCxJ72rvqdvxk9+6sa1UjYhm81W0SHfofzImpXyrf15ze83h9MWGeZsD8XUIW kVTZqruNk2J8R8LQwOC3cXquLsrjStjyYWwP7aSbMTpPv/S29yoqJ9+jGzNNJymq0bao HipH4Hq5DeA/0tv6dba0EpxzM8SxXZPry43vGT9fc+DogE3xpY7/owHSrUeRZRSH1eBH q6MwBOaJc1ABi+WRSbO+kKI/q0NBBXp8EBoZz8uIzO20olEOCD5Njw1ucFxgMNVsAKbh M+VQ== X-Gm-Message-State: AOAM531gj8T8WeeGEhbFas/KSPyA42PLi0MoPbxwmQgWCUCMYikeXS+7 hL7vxKPG3zW3Q+qQ80qk70o= X-Received: by 2002:a37:6516:: with SMTP id z22mr11135550qkb.164.1598386284822; Tue, 25 Aug 2020 13:11:24 -0700 (PDT) Received: from localhost.localdomain (cpe-71-65-111-223.cinci.res.rr.com. [71.65.111.223]) by smtp.googlemail.com with ESMTPSA id n23sm12453459qkk.105.2020.08.25.13.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 13:11:24 -0700 (PDT) From: Connor McAdams Cc: conmanx360@gmail.com, Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 13/20] ALSA: hda/ca0132 - Add ca0132_mmio_init data for SoundBlaster AE-7. Date: Tue, 25 Aug 2020 16:10:32 -0400 Message-Id: <20200825201040.30339-14-conmanx360@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825201040.30339-1-conmanx360@gmail.com> References: <20200825201040.30339-1-conmanx360@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Modify the AE-5 ca0132_mmio_init function to add AE-7 specific writes. Signed-off-by: Connor McAdams --- sound/pci/hda/patch_ca0132.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index bd5d4f0bd6f5..10aaa4806946 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -8748,8 +8748,26 @@ static void ca0132_mmio_init_ae5(struct hda_codec *codec) data = ca0113_mmio_init_data_ae5; count = ARRAY_SIZE(ca0113_mmio_init_data_ae5); - for (i = 0; i < count; i++) + if (ca0132_quirk(spec) == QUIRK_AE7) { + writel(0x00000680, spec->mem_base + 0x1c); + writel(0x00880680, spec->mem_base + 0x1c); + } + + for (i = 0; i < count; i++) { + /* + * AE-7 shares all writes with the AE-5, except that it writes + * a different value to 0x20c. + */ + if (i == 21 && ca0132_quirk(spec) == QUIRK_AE7) { + writel(0x00800001, spec->mem_base + addr[i]); + continue; + } + writel(data[i], spec->mem_base + addr[i]); + } + + if (ca0132_quirk(spec) == QUIRK_AE5) + writel(0x00880680, spec->mem_base + 0x1c); } static void ca0132_mmio_init(struct hda_codec *codec) -- 2.20.1