Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1121014pxx; Tue, 27 Oct 2020 08:43:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIG+eyNQ/WhrTyyixpUY4K77BU72nV24Mkc61Na4l/jWwGnd2zNeAbFSg/OnF91v89naaC X-Received: by 2002:a17:906:bc93:: with SMTP id lv19mr2929758ejb.147.1603813429509; Tue, 27 Oct 2020 08:43:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603813429; cv=none; d=google.com; s=arc-20160816; b=0xMOoFAU/WFOluxQAXXCvSROCxZHrhsQ8eloEuvV+imf23IFbW3PUtHoe0QtxciSOl Ow/0aqjPlH63FnDIVZ6RiWXpBpbQHhPtdNNg2hcHKpjMLWEYuGjHK9buL9aVLFm/MpJ+ BXhTxGek+UWt1GJRqsHUE64XH2B3nXNrlAFW9JY5JVpLvZ4q9kff/kIL9Lfr+SSHwdxD uqfW5JPUrtEirC3iCWqpUx0TJky5Y72lTv5eJ5aWHad0IM62Mo4zYRpb/Y5nZNwGFgRf lvMbXHh1y+Dp7LmP2df1xaK+x3s54vcTilrA/3UCIOOIqLXk8V4yjfKWBLqtUd9Q+WlQ ur5g== 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=9jr9xHowsDea+zblxSbHanvoeTTrpm32Kt8r0nqmICM=; b=sEzHtB66zGw+WLGRTyIC+tKRsZDUkhLbAnRIAtx+Qbrllp732dw5t7REUCN1I5+oN/ /hs28/ba70sYEh7sDi3SRl+G4Eo9WC+EZ9CgpxWQPLzznKNIMx37YAu4PhDobiA3FE3y Nl2wlWMr/W82scntlYQVkvACwytoA2aO8AfSQ6sXX8/OeObK9bAq/xYEb0BRWK8bdilw VYFzHuv/T59Jbd17JUEo0rNojAmJS13V17+czbr07UDCiN+5PifKqxwfFzKyGreEDuvH 1sOY7R9OTx72n4VJG4rFlfOOMIRbgbroT2glAqdsCn388Tjj1yKf7K5C3d6+EYNNJL9E hAAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QcZjOTIs; 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 i9si1239984eje.410.2020.10.27.08.43.23; Tue, 27 Oct 2020 08:43:49 -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=QcZjOTIs; 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 S1764204AbgJ0Oqe (ORCPT + 99 others); Tue, 27 Oct 2020 10:46:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:46384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764172AbgJ0Oqb (ORCPT ); Tue, 27 Oct 2020 10:46:31 -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 84E6921D7B; Tue, 27 Oct 2020 14:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809990; bh=4zGNFbY7pK8FGmT7frVAZEUTM45DB33dNb1+3mENHIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QcZjOTIszg6VSgLNDWMfg84rbtUcuQjFjXGrLJdAY7tIyVRjLOP8r1pBtIcnFS86k 3dn05gC7ukm+pF4gyGWI+BkyZfl984na0FgepsML+HpJqZapRYE3wMnNc65sbX+IdL gum9fzxhUdbY8OprhlGV9lm05uxGqhabQEWUdzYw= 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.4 391/408] ALSA: hda/ca0132 - Add AE-7 microphone selection commands. Date: Tue, 27 Oct 2020 14:55:29 +0100 Message-Id: <20201027135513.113162444@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@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 6aa39339db0ab..98a11c38e7a8e 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -4674,6 +4674,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; @@ -4719,6 +4728,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; } @@ -4728,7 +4745,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