From patchwork Wed Mar 7 14:13:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130897 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5232355lja; Wed, 7 Mar 2018 06:14:12 -0800 (PST) X-Google-Smtp-Source: AG47ELuCWF7izYn1/HrdD9tLhC3rjujhGHYkrI83nFK8aiIBmj+WSU7jfsk5kOCA9BVJjAso/opy X-Received: by 10.28.18.146 with SMTP id 140mr15759860wms.50.1520432052133; Wed, 07 Mar 2018 06:14:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520432052; cv=none; d=google.com; s=arc-20160816; b=C0+jASQFk5gUh0cL+xjZKPPpmqwnwfPzHayFLXXmg8B5OfL7Ar9uW6djHqvYFA3gR5 TL8nX6RDOV0uLNaIDdzwWMlmj/mr30MB2F+cVjwxP3okQsrMNkO1u9nnZ/02HNGdOVy0 zSZXDkgLW80RlFYF71d/wt3qzZuf3UP9fXIadqbraWD41gb6G065XARaOTENyJlVNMT3 VC6clh8EhpbqiajfMblNdj/vCUX1G6defjacCdqYF8g9P29KL8MJn1T6dmj1RO5FJmXV vwEhSJ8rmAS5qsqza3ZJCx2KszSccMaXuqwyJKluj92ejg3J1PcmJMBHFyFIofvqnaGd VwZw== 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=PwzslfpqlgpQHpI6z0+7PhzTJfirU13/PadJJAQEyEs=; b=nbu0kce/EA/VVu5MWxvgJ7NoSJODLdWx5ciwvHcLnJtVoP7YZmuCoyVOZlqMGaRG0c M5Jel9s/fWDSz/62Q0gfHG8TvcwroKwD/Q2fB3xJ83xRULcN5Unnts465cbXvauMj+e6 94eP65yLVnxdVJAWWgXJvZYrtFfpWiU6M1JvdbDij8WLvWylBWQomceHuLNRR7KTpeSf 2OWUnYZ21vlARjAevyIqpqA8KsFs9uRvMWQb5VPoSMFJ90pHjXM+xaQdrMVYlh+CrnSU GoFggRNObo27SIYQYjD5sDAoTrWdIinP38BD5/jTd50dz5LWQ3wA7owvdcKRa5JmMJSx cG/Q== 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=Bbpetu+B; 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 b11si13033424wrd.87.2018.03.07.06.14.11; Wed, 07 Mar 2018 06:14:12 -0800 (PST) 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=Bbpetu+B; 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 D95F82673A4; Wed, 7 Mar 2018 15:13:56 +0100 (CET) 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 F134A2673A6; Wed, 7 Mar 2018 15:13:53 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 71E11267380 for ; Wed, 7 Mar 2018 15:13:51 +0100 (CET) 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=HtvzpExeUzFFREdoDHrryZt/mKniyg4JiVFWADsPf+Y=; b=Bbpetu+B92BI V3GG6HALRGAkyB3FLAaj9Sz9958qoNt6m1Oa/iK8CXhxbcIcpMf5/DdwfcAHBM38jpau0zyh5uMyH a06vFUvvD3H5R2l5zFgcyrsLtWkd43zRfdZu18i7aekM4SMe3KyXBUVHPL159Jy9HspDviZznW2/K eX2RY=; 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 1etZpD-0000AS-0T; Wed, 07 Mar 2018 14:13:47 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1etZpC-0001NU-Hf; Wed, 07 Mar 2018 14:13:46 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180225104713.4745-21-hdegoede@redhat.com> Message-Id: Date: Wed, 07 Mar 2018 14:13:46 +0000 Cc: Oder Chiou , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Takashi Iwai , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: rt5651: Add rt5651_jack_inserted() helper" 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: rt5651: Add rt5651_jack_inserted() helper 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 0fe9474598890b4bd8a7228c9b1872ed7fe3c2c5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 4 Mar 2018 15:35:56 +0100 Subject: [PATCH] ASoC: rt5651: Add rt5651_jack_inserted() helper Add rt5651_jack_inserted() helper to get the jack-detect switch status, This is a preparation patch for rewriting the jack type-detection to make it more reliable. Tested-by: Carlo Caione Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/codecs/rt5651.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 873af6798d7a..41fc574dbc3d 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1597,6 +1597,31 @@ static bool rt5651_micbias1_ovcd(struct snd_soc_component *component) return (val & RT5651_MB1_OC_CLR); } +static bool rt5651_jack_inserted(struct snd_soc_component *component) +{ + struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component); + int val; + + val = snd_soc_component_read32(component, RT5651_INT_IRQ_ST); + dev_dbg(component->dev, "irq status %#04x\n", val); + + switch (rt5651->jd_src) { + case RT5651_JD1_1: + val &= 0x1000; + break; + case RT5651_JD1_2: + val &= 0x2000; + break; + case RT5651_JD2: + val &= 0x4000; + break; + default: + break; + } + + return val == 0; +} + static irqreturn_t rt5651_irq(int irq, void *data) { struct rt5651_priv *rt5651 = data; @@ -1927,27 +1952,13 @@ static void rt5651_jack_detect_work(struct work_struct *work) { struct rt5651_priv *rt5651 = container_of(work, struct rt5651_priv, jack_detect_work.work); - - int report, val = 0; + int report, jack_inserted; if (!rt5651->component) return; - switch (rt5651->jd_src) { - case RT5651_JD1_1: - val = snd_soc_component_read32(rt5651->component, RT5651_INT_IRQ_ST) & 0x1000; - break; - case RT5651_JD1_2: - val = snd_soc_component_read32(rt5651->component, RT5651_INT_IRQ_ST) & 0x2000; - break; - case RT5651_JD2: - val = snd_soc_component_read32(rt5651->component, RT5651_INT_IRQ_ST) & 0x4000; - break; - default: - break; - } - - report = rt5651_jack_detect(rt5651->component, !val); + jack_inserted = rt5651_jack_inserted(rt5651->component); + report = rt5651_jack_detect(rt5651->component, jack_inserted); snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET); }