From patchwork Fri Jul 7 12:52:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 107194 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp26702qge; Fri, 7 Jul 2017 05:53:47 -0700 (PDT) X-Received: by 10.28.52.133 with SMTP id b127mr2240264wma.2.1499432027264; Fri, 07 Jul 2017 05:53:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499432027; cv=none; d=google.com; s=arc-20160816; b=eToAs6NdZ9hRJYtrjNWB4V9HkXDOHOjQVkrNqHscMMba0hmcJVNeUZASTFpPTC9gwK w9sR7IyXsbt1P+taZckdkc0cDbGMgZjyVYr7CrkWjbDDU0wNQ/+fhHt+kaulCZFqaJwp fChL3EkR43GzxcvCHBW4tz4ujsfzP6u2hCJI24lHspJELMESYcg/eujA4ASIUctgeaR+ TJl9u/iqbty4VfWA7oRS2equFV2eo+Ki14o3BSqJMqp/pFT9wFJuwZn6PlqYgxt50C0A PQB+fnpPFUGmCewZLtpS6o4RuaS+Jh8iDqb3vf1+KQC7hBEsaf0uKuHFiVpYPxH+I2fR IYLg== 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 :delivered-to:arc-authentication-results; bh=z8fmfjpXCN9BBjVKwTogtRci3LATU2WQSOoqJ99e+GE=; b=bDUFhiDtoNxdhWA0peSNnE4qFEjEQaMEqnuJ9GIs/zkD+HqPhotgw8jWP3s+rb4+mn zxTRYsFqqzraKDOYDEGklX53UhOiZNo5KVhor0Gj51RXIC5CgqrAHD7PsidoPL+ZmLS1 Fw4UQUpHfnLPD8xesqqGywgybGWmTevrnP3/TiywxVSCBJQmYfRkTyBuRW+WP4+Ytu/u +1PknWZAJtZsJamjxd25BNL+QFqs0j4ZoNZ7/v77i1JdV3jVrq+WKAdkK+ONaykEROeZ yg7wii5sYNerUxKVQHLiwQ8yFy+OyacN7CDsMdKWpV5y8J2kIMpboJrem3hzJO/kCggx YYCQ== ARC-Authentication-Results: i=1; mx.google.com; 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 b126si2979242wma.65.2017.07.07.05.53.47; Fri, 07 Jul 2017 05:53:47 -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; 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 73FE1267251; Fri, 7 Jul 2017 14:53:15 +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 D9DE8267203; Fri, 7 Jul 2017 14:53:13 +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=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 665FE267214 for ; Fri, 7 Jul 2017 14:52:45 +0200 (CEST) Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dTSkR-0005Zc-1y; Fri, 07 Jul 2017 12:52:41 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dTSkN-0002qa-Jr; Fri, 07 Jul 2017 13:52:35 +0100 From: Mark Brown To: oder_chiou@realtek.com In-Reply-To: <1499417939-319-2-git-send-email-oder_chiou@realtek.com> Message-Id: Date: Fri, 07 Jul 2017 13:52:35 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5:7e7a:91ff:fede:4a45 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: Oder Chiou , jack.yu@realtek.com, alsa-devel@alsa-project.org, hychao@google.com, lgirdwood@gmail.com, albertchen@realtek.com, broonie@kernel.org, shumingf@realtek.com, bardliao@realtek.com, flove@realtek.com Subject: [alsa-devel] Applied "ASoC: rt5663: Optimize the Jack Type detection" 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: rt5663: Optimize the Jack Type detection has been applied to the asoc tree at git://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 fa8b3b6a5a081697e7158687c7803020040c7d2e Mon Sep 17 00:00:00 2001 From: "oder_chiou@realtek.com" Date: Fri, 7 Jul 2017 16:58:58 +0800 Subject: [PATCH] ASoC: rt5663: Optimize the Jack Type detection The patch optimizes the Jack Type detection. Signed-off-by: Oder Chiou Signed-off-by: Mark Brown --- sound/soc/codecs/rt5663.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) -- 2.13.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/rt5663.c b/sound/soc/codecs/rt5663.c index 18b3b526b7c5..ebd9ae00e04d 100644 --- a/sound/soc/codecs/rt5663.c +++ b/sound/soc/codecs/rt5663.c @@ -1508,7 +1508,7 @@ static int rt5663_v2_jack_detect(struct snd_soc_codec *codec, int jack_insert) static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert) { struct rt5663_priv *rt5663 = snd_soc_codec_get_drvdata(codec); - int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30}; + int val, i = 0; dev_dbg(codec->dev, "%s jack_insert:%d\n", __func__, jack_insert); @@ -1543,17 +1543,22 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert) RT5663_IRQ_POW_SAV_MASK, RT5663_IRQ_POW_SAV_EN); snd_soc_update_bits(codec, RT5663_IRQ_1, RT5663_EN_IRQ_JD1_MASK, RT5663_EN_IRQ_JD1_EN); - while (i < 5) { - msleep(sleep_time[i]); - val = snd_soc_read(codec, RT5663_EM_JACK_TYPE_2) & - 0x0003; - dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n", - __func__, val, sleep_time[i]); - i++; - if (val == 0x1 || val == 0x2 || val == 0x3) + + while (true) { + regmap_read(rt5663->regmap, RT5663_INT_ST_2, &val); + if (!(val & 0x80)) + usleep_range(10000, 10005); + else + break; + + if (i > 200) break; + i++; } + + val = snd_soc_read(codec, RT5663_EM_JACK_TYPE_2) & 0x0003; dev_dbg(codec->dev, "%s val = %d\n", __func__, val); + switch (val) { case 1: case 2: