From patchwork Thu Oct 26 14:16:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 117242 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp823145qgn; Thu, 26 Oct 2017 07:17:07 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S5CvTTaRa/mKZcZjqunLLQ6i19lnLHBbZCx6MXBbM51AU//QpQkv9FFTZMyaG56Fb+QUb3 X-Received: by 10.28.59.134 with SMTP id i128mr1905824wma.114.1509027426895; Thu, 26 Oct 2017 07:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509027426; cv=none; d=google.com; s=arc-20160816; b=MFy2CiN6QtLhNEdLRHPtzclF7aNEQGWedzl1eKPzXFcBoxzRFYut+xtQOl+1RPr4Y0 B3tNHtTWIstqfEFesARGjlXwAkPjX+7UqDJNei9mlaeS+boF/XHw8fKJY5rBCbc+XZmt h4BVvnK5JIq8Q2LaVlDWAeYXPp7BTFr7fhXpFLdkcbjSTcdHq6xJywVkqCoOUdj3VAX6 uw9TfU4LkB9PVFWfDX455DukLRH0fILSlkijhibRkr1efH6OY2Yl5uoUQyu5B37qT8y0 LW/Ma8EsHNnC6pdNHRS1TY7QO9FGcunbnSn4GvAiWWMJmpkU2x3J56x6ts9tOcbkwMy+ EoZg== 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=5AQlqulMei1mXjGLwyhNiJzSgS9hmb/nfMUQYc9CpEo=; b=OaU5gQcO4FK1zbI37gF+0ozsWrs4nll6V+qek5g+S2dib7dfmab/rHpC4A43lDkRt1 +9DUpVbMmXTHM7cl2yBoMcn/XOSRde5c0S4JKEja59d5oYcG5qiVBXroOCQbzkMyYRqj 63b9Z0MMtTQm8CGHxK9i3nVDN+GH0LiuauU9wZUCdnKdDOBgLPswiqo8u/d8woR4B95F l7qRWb5dQ0vkioPXZxnaTa751z3q6li0BXuxFahRbm1DNf9ONKd6ScXcURku0pRKeFjm pbdtdlORaCxlN1Q6MBy43f8gJ0gIkV1JKKS0pRl2hmnLwIc0YpK/T1rQ1PFLx+q4u4kF ifDg== 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=Q3JG/BKu; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id c10si4255585wrg.554.2017.10.26.07.17.06; Thu, 26 Oct 2017 07:17:06 -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=Q3JG/BKu; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 03B752670CE; Thu, 26 Oct 2017 16:16:54 +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 27BD32670CE; Thu, 26 Oct 2017 16:16:53 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, 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 73772266E15 for ; Thu, 26 Oct 2017 16:16:51 +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=t/GMQsPodzer0CajXkQb0MiEeQ/QvdclgLoWI7Ikek0=; b=Q3JG/BKu+2zi T223xix8Ji3W1j4ltfx/T/k+yuFTPKBbnPKSlEOoYqfKrGNszpKyZZ0EuMWpPf2WfK2Qq7OA0B+sk aJ/+egwlyS7ga85HnUGlL96K6+Vl0t9zdHG05yVpc12k5ECBqvK1dgfDrgWC1DGatrZCufMlqOJT+ cjWAE=; Received: from [62.168.35.108] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1e7ixm-00020R-Df; Thu, 26 Oct 2017 14:16:50 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 3D56F44005B; Thu, 26 Oct 2017 15:16:50 +0100 (BST) From: Mark Brown To: Carlo Caione In-Reply-To: <20171020111859.2448-3-carlo@caione.org> Message-Id: <20171026141650.3D56F44005B@finisterre.ee.mobilebroadband> Date: Thu, 26 Oct 2017 15:16:50 +0100 (BST) Cc: oder_chiou@realtek.com, alsa-devel@alsa-project.org, edgar_shen@realtek.com, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, linux-kernel@vger.kernel.org, albertchen@realtek.com, broonie@kernel.org, bardliao@realtek.com, linux@endlessm.com Subject: [alsa-devel] Applied "ASoC: intel: byt: Add headset jack" 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: byt: Add headset jack 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 d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Fri, 20 Oct 2017 12:18:56 +0100 Subject: [PATCH] ASoC: intel: byt: Add headset jack Introduce an headset jack in the machine driver and register it to the codec driver. Signed-off-by: Carlo Caione Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.14.1 _______________________________________________ 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/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 51de1bbe8ecd..0df9067e4382 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -47,6 +47,7 @@ enum { struct byt_rt5651_private { struct clk *mclk; + struct snd_soc_jack jack; }; static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC_MAP | @@ -177,6 +178,17 @@ static const struct snd_kcontrol_new byt_rt5651_controls[] = { SOC_DAPM_PIN_SWITCH("Speaker"), }; +static struct snd_soc_jack_pin bytcr_jack_pins[] = { + { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, + }, +}; + static int byt_rt5651_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -244,6 +256,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; + struct snd_soc_codec *codec = runtime->codec; struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card); const struct snd_soc_dapm_route *custom_map; int num_routes; @@ -301,6 +314,16 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) dev_err(card->dev, "unable to set MCLK rate\n"); } + ret = snd_soc_card_jack_new(runtime->card, "Headset", + SND_JACK_HEADSET, &priv->jack, + bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins)); + if (ret) { + dev_err(runtime->dev, "Headset jack creation failed %d\n", ret); + return ret; + } + + rt5651_set_jack_detect(codec, &priv->jack); + return ret; }