From patchwork Wed May 23 08:38:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 136635 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp611199lji; Wed, 23 May 2018 01:38:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoEip6labBN2wnf6v2S3w8Xh6SpuQQm8qG1l08Nh1nb0fxCFolrmXqb11XBmOXlXFgEhV1e X-Received: by 2002:adf:8e82:: with SMTP id q2-v6mr1668143wrb.53.1527064714186; Wed, 23 May 2018 01:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527064714; cv=none; d=google.com; s=arc-20160816; b=YNGl8Vvi0ZURdDmNyqw+8l3skcwxN36xjq3bha3sFFC3Z8G1bHwUUU6VqSvGMl+g9Y FM7VrmaJ8cxWIn3Vl5fVfpGx5TYsIME24s/MBjWbM+Py+HWzmn2j+fHpnDGjt8uMk0r9 OrGAU4Hge8rK/WnxpCBPDpyFDyEluuB0NvY9fL+vr/3w6KzRSBGtEnxi4Oox/qucXMSz +Rxawqd6BPhiVJEox9wWdzR6Pbce4sAgD8qGq0DuteX+tbwWvIyb8EFTnvuhlE3FnIDe vkNS+rdnOLSzhMmgINwsV8y0KMq1zyTylaXW/9NVomTyDG3+zIMRQzhedBbpJQbQI94v 6RoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=tm2wxPUHYB38ghTHKs/VKWSkyZYchrnpMDeW4IoylXc=; b=zRXEXgNtJucLjsQ8epfNOl0vOpHmJvsRnpWqtqMC2nrjQz7x29NwLmKoDbrvIv8Y7h nOevb9e/xhvK9SWUsXfAMCd25aM00hPxw4docoer1hEqcEb2ZVdzSrfOWiqpDZJz7e9D 5vYwyk3d02s6hmZiijpURd8be1cqGqUP3B2v5xmBldnUD0GKuRyasfDWfpuzDdm3HMWn qwUlMO1G1q8atWXChReeija5fL22a8+p7gHHFZtlTt7nv9eZGlWBepK5G6b6fqDeG64u 5bt/AZlYjouZMXRe6qQTtnd8eeM7ZVHcupirL87nX+GqUnrZKTtXEsGGPO7ehuGZ6ZTG GEUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=IWOu7I/6; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id j6-v6si15923661wre.173.2018.05.23.01.38.34; Wed, 23 May 2018 01:38:34 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=IWOu7I/6; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4FF4C2671D2; Wed, 23 May 2018 10:38:32 +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 CEC8A267265; Wed, 23 May 2018 10:38:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id CCC4B266F88 for ; Wed, 23 May 2018 10:38:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=6IyW+DSONESe/fVqO6HWWhln/n5XJOwP+vO8Rwz/xYQ=; b=IWOu7I/6UM9K PCv6l2I+KKhxROgaIztPYgqp9iPp/dCKu62WHXr5qOqFxWvGRExd47SXtEQdNO2URFfDGr4PBJ0sO uAyj7l43aYoUC97I270Dcxhz99IEepLRojGswS39voTMEj5l+8om0CdqdaNaU0N9HZBKE2f/Jx+dB lR+7A=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fLPHk-0003A8-Uk; Wed, 23 May 2018 08:38:16 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fLPHk-0000hK-EP; Wed, 23 May 2018 09:38:16 +0100 From: Mark Brown To: Hans de Goede In-Reply-To: <20180521124251.10535-1-hdegoede@redhat.com> Message-Id: Date: Wed, 23 May 2018 09:38:16 +0100 Cc: alsa-devel@alsa-project.org, John Hsu , Takashi Iwai , Pierre-Louis Bossart , Liam Girdwood , Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: cht_bsw_nau8824: Fix jack_type to include SND_JACK_MICROPHONE" to the asoc tree 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 The patch ASoC: Intel: cht_bsw_nau8824: Fix jack_type to include SND_JACK_MICROPHONE has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 5aff078ac81a3be58f7a2e2be0f33bc9ce062bac Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 21 May 2018 14:42:51 +0200 Subject: [PATCH] ASoC: Intel: cht_bsw_nau8824: Fix jack_type to include SND_JACK_MICROPHONE The nau8824 codec can detect whether a headset or plain headphones is inserted (as well as button presses on the headset) as such the jack_type passed to snd_soc_card_jack_new() should include SND_JACK_MICROPHONE. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 072e94b69e57..30c46977d53c 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -120,7 +120,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) * KEY_VOLUMEUP * KEY_VOLUMEDOWN */ - jack_type = SND_JACK_HEADPHONE | SND_JACK_BTN_0 | SND_JACK_BTN_1 | + jack_type = SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3; ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, jack, cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins));