From patchwork Thu Mar 1 19:25:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130402 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3190745edc; Thu, 1 Mar 2018 11:27:43 -0800 (PST) X-Google-Smtp-Source: AG47ELsIX3clv/70HEhGli8aWD1twTT/d+TbA2YOpQalXmnwQjQMN5jNcxOHPdZQ4TiYn9rajyKf X-Received: by 10.223.132.167 with SMTP id 36mr3074198wrg.227.1519932463144; Thu, 01 Mar 2018 11:27:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519932463; cv=none; d=google.com; s=arc-20160816; b=lKVeuqJNuYPeCqS5wzEd4iMEyen2KYrbsu1QvAm2zXOQA5SHstWD99auzyn/eEiW2S nRj5G9U7MtxHYsr7oaH2WXAuRA4gOHpH5YuTzHoRT8/6g56Yk6DwvCtTcad3PqtYP5pm FfoxUb0R+HvaqthygeQBC3oTuyNOZlFLrXM/Qg3s6+dfbrKUrLXIlGC6Z6ZXG8oDS3qP oVt/c8UFQtSmr4XP9CjVEHAz4xYdQoGA3STAPnjhOm+DeJr+ptMYW+DPppxD9fQNbRdQ Nh6NZxvye6gVd+n3PsB2Eu7Vp7x/XOlR8C2K0z4myIqhdAiy4f7qVUQRWj3usiCU12vU T1Vw== 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=ytP2hMFT/T/36dH4CtpuhdD8ZV7SuQVFMvGknx0GqNk=; b=WMSonZl62z0p+puBXvLzLr4uKdSF1PP5810JKoprWZw/6LIoWDV1H/eB/TNueFOBIJ 5x/x9Y/oPpDz0WEnLjH2zBHrssdOvbe22QCCw/ckiiU3HF35kXhMaAV4GSC2E1F3Xm5O 3+VGSP+GfeBfAdVXRWVO3Qu4ZksbGoQsWuFQAvpWhOUgbg+ji8A0jtnEHpSlw1fUR0Bm G0+jw8UeR5wkM+SwIX9fqwhdqH2313f/BrAL29LP6XzC+O0cO+f2GW2bvMiEX9FoWX1w 63Q1wfLettNDi7HrNthK85tMb4XW1ZNuPtaXL751TOOdHr6v6Wrh2tidQDd5yFhB/xRZ FUog== 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=mFWTWRMI; 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 v124si2958922wme.232.2018.03.01.11.27.42; Thu, 01 Mar 2018 11:27:43 -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=mFWTWRMI; 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 E8F57267BBC; Thu, 1 Mar 2018 20:27:30 +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 B095B267BC5; Thu, 1 Mar 2018 20:27:27 +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 CB3B3267BBF for ; Thu, 1 Mar 2018 20:27:23 +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=Xf+QylCmH/sFmxfZStOQ3iT/mVZArhLGKSakdr3+1nI=; b=mFWTWRMI6n/L oyncR55SHLgnqow5XQkmDVkEFcjRsj7zpXn2f+1yuKOWvHDwfQWkUTK9omb0kPhyAI4PMmODQASV3 U2jcI81APXA8jS8ufa65d2e6x7NNzPnGN0VsAWVqvJC0F4xswpKCWq0qnHm/h82EfzmqT5cd6TS0I dJ97A=; 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 1erTpu-0005iP-3z; Thu, 01 Mar 2018 19:25:50 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erTpt-0001RC-HK; Thu, 01 Mar 2018 19:25:49 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180225104713.4745-17-hdegoede@redhat.com> Message-Id: Date: Thu, 01 Mar 2018 19:25:49 +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: Always keep OVCD enabled" 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: Always keep OVCD enabled 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 f1088d4b813fb4d20fc9e8e8db5ca252923f25eb Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 25 Feb 2018 11:46:57 +0100 Subject: [PATCH] ASoC: rt5651: Always keep OVCD enabled OVCD is not only useful for jack-type detection, but is also useful to protect against over-current faults in general, so always keep OVCD enabled, instead of only enabling it for jack-type detection. Tested-by: Carlo Caione Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/codecs/rt5651.c | 9 +-------- 1 file changed, 1 insertion(+), 8 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 41d7c192ac03..55bcc74e344f 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1642,7 +1642,7 @@ static int rt5651_set_jack(struct snd_soc_component *component, RT5651_MIC1_OVTH_MASK | RT5651_PWR_CLK12M_MASK | RT5651_PWR_MB_MASK, - RT5651_MIC1_OVCD_DIS | + RT5651_MIC1_OVCD_EN | RT5651_MIC1_OVTH_600UA | RT5651_PWR_MB_PU | RT5651_PWR_CLK12M_PU); @@ -1849,9 +1849,6 @@ static int rt5651_jack_detect(struct snd_soc_component *component, int jack_inse if (jack_insert) { rt5651_enable_micbias1_for_ovcd(component); - snd_soc_component_update_bits(component, RT5651_MICBIAS, - RT5651_MIC1_OVCD_MASK, - RT5651_MIC1_OVCD_EN); msleep(100); if (snd_soc_component_read32(component, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR) jack_type = SND_JACK_HEADPHONE; @@ -1862,10 +1859,6 @@ static int rt5651_jack_detect(struct snd_soc_component *component, int jack_inse rt5651_disable_micbias1_for_ovcd(component); } else { /* jack out */ jack_type = 0; - - snd_soc_component_update_bits(component, RT5651_MICBIAS, - RT5651_MIC1_OVCD_MASK, - RT5651_MIC1_OVCD_DIS); } return jack_type;