Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp414874pxx; Wed, 28 Oct 2020 07:51:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyng9AnFV3FKfMiZ3W8+jQvQESL2A0I7oUmGZrNpzc0ZwkunoyM57uOLB8OCOQ8HTFbmNba X-Received: by 2002:a50:be87:: with SMTP id b7mr8392534edk.185.1603896700930; Wed, 28 Oct 2020 07:51:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603896700; cv=none; d=google.com; s=arc-20160816; b=vsy1DNrK9BylChRoM21ygSmb6bTGnNiYLTLdrkp74wB9wZ7WxFSa08owTFoanaOMWN B0R81bSt3MG019F/oTF6ZNUMas49AHGmx8//AwPpk+/GVV/5S83Rr9GDUBGuQ5nGvhsk Nw88ZdxGZSj0e4JlDC5t1/G8uUiVntVfGUjzQyEdTc/0NUV6amUZxKwyo4sRIGbQCXXs 8e2H0SkhbpX3WHVVcTFV/efnc2iFql0iH1GJuQzWI6GXeT05B6T/yweO99DFzMLPYjBm w5veMqTCFDx1hhuzkwEAu5x0KuUh58FZQHZuPXUSnIkhcQ9VjPiBZQlMtux+M4EHhLz0 j10w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=94R9GRNMxOa0upQ32SN8OWhz0lnMYY3dq+qBMOCvQBQ=; b=DSSoR3HBHjbV7pjSFxTxb74pEsna3EhUNA+dCUgEQi7F1xjbu1qYEOE9JFYz36QHWQ 65hwKzeNWKZXjjohCUlcN261HYCwW22Be6ZUIQWlUg7+7xjl+KwqDbk7EzNcszw55sFg X7WsjZEQRtcrOI7Bg3TPG3W2Plpzsee9GFGN2r4DsHaX937Ca+tNH/mpF6IdFBORKMQG Mup+EcmF+pN232DgiS+43TMe3+NG8C+FI0aTcw31WQq4Don7lra6eVBZxuJ422I/1yXf KLY1CiaPaJqL+fzXYbwTt8OX2pvni7k6M1BQxUUuuyMfvlHw78vCLnL7yXmRRLsOXIvc Z5BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=H1Z3inN0; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t1si2868715ejb.712.2020.10.28.07.51.18; Wed, 28 Oct 2020 07:51:40 -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=pass header.i=@kernel.org header.s=default header.b=H1Z3inN0; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1807549AbgJ0QLj (ORCPT + 99 others); Tue, 27 Oct 2020 12:11:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:54508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1803436AbgJ0Pwy (ORCPT ); Tue, 27 Oct 2020 11:52:54 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 53C4520657; Tue, 27 Oct 2020 15:52:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813972; bh=+18Rmy1rZb4EA8ZKVxJUrwxKrhYtc4JVUL89try4Ahc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H1Z3inN03x2p/zRRfr5IqjLhujK5TdwfU9ZyGfbOs5gRkYwaa+50CLylj5knGCdoC Y03g6blUBPlXscaZ2eHYC8rJw6rddSR7WuGFvBJv96KybH84KfKObcIpHR00NriU0r f20PewP1wanBTxYjwSeU6q6onMHLI3Mjt1eyAJ3A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Connor McAdams , Takashi Iwai , Sasha Levin Subject: [PATCH 5.9 732/757] ALSA: hda/ca0132 - Add AE-7 microphone selection commands. Date: Tue, 27 Oct 2020 14:56:22 +0100 Message-Id: <20201027135524.842494771@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Connor McAdams [ Upstream commit ed93f9750c6c2ed371347d0aac3dcd31cb9cf256 ] Add AE-7 quirk data for setting of microphone. The AE-7 has no front panel connector, so only rear-mic/line-in have new commands. Signed-off-by: Connor McAdams Link: https://lore.kernel.org/r/20200825201040.30339-19-conmanx360@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/patch_ca0132.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index b7dbf2e7f77af..c68669911de0a 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -4675,6 +4675,15 @@ static int ca0132_alt_select_in(struct hda_codec *codec) ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00); tmp = FLOAT_THREE; break; + case QUIRK_AE7: + ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00); + tmp = FLOAT_THREE; + chipio_set_conn_rate(codec, MEM_CONNID_MICIN2, + SR_96_000); + chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2, + SR_96_000); + dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO); + break; default: tmp = FLOAT_ONE; break; @@ -4720,6 +4729,14 @@ static int ca0132_alt_select_in(struct hda_codec *codec) case QUIRK_AE5: ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00); break; + case QUIRK_AE7: + ca0113_mmio_command_set(codec, 0x30, 0x28, 0x3f); + chipio_set_conn_rate(codec, MEM_CONNID_MICIN2, + SR_96_000); + chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2, + SR_96_000); + dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO); + break; default: break; } @@ -4729,7 +4746,10 @@ static int ca0132_alt_select_in(struct hda_codec *codec) if (ca0132_quirk(spec) == QUIRK_R3DI) chipio_set_conn_rate(codec, 0x0F, SR_96_000); - tmp = FLOAT_ZERO; + if (ca0132_quirk(spec) == QUIRK_AE7) + tmp = FLOAT_THREE; + else + tmp = FLOAT_ZERO; dspio_set_uint_param(codec, 0x80, 0x00, tmp); switch (ca0132_quirk(spec)) { -- 2.25.1