From patchwork Thu Mar 1 19:26:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130397 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3190073edc; Thu, 1 Mar 2018 11:26:57 -0800 (PST) X-Google-Smtp-Source: AG47ELvgLlpqCvp6BYZe2X/DnCFCD5wj15wH15LCTqIXRCBcFbptKcdH0MKli/LAadLs34KeOsW+ X-Received: by 10.28.8.201 with SMTP id 192mr2279110wmi.47.1519932417792; Thu, 01 Mar 2018 11:26:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519932417; cv=none; d=google.com; s=arc-20160816; b=DH2QDSH3JuP/X4WrRs/czCeWuaR7T4EOYfm1AoSs+DZGmu6YEG2lLvN47PwTyBEsMt gpajxejs//jrmmxNCU3rsfK76nkOggc5Bvmf8JflvuB++RTBCKi+z00/dVT1i70Uj22N W7JsHb3XzQNbLcaadHkjNNbPoi0GyKg7xtKm7E4iYUx4tImOktclYWa5a5i4zHdkgJps wMkerGb59rcL3WCdWsItTc7BV17CDpcc/N75v0pTmK4hQtfPyzMGMPlhsnLWlDz9S1N/ orvCDGuOMB7KiyQjW5ctgDgHtAlhpLRAFVPqetx9p8IYZDwdR83pOV+JsD6yXiJD6WKs pRtg== 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=Iy9l1aL5TZu85cBqq9x9gxPe7KdqHdkUO87SSuCwhg8=; b=kBkqRYI2BBMXf8YHO5UazhBIFYwtu/nm+BbzYw8HKZVZf8q7WCT8A3L2pFXN2wI7P3 EKAZmJFsXQyZUJEIg5JdlpK/Gue5XZNpxktsdAGKDLdp07RV6s5VgUExDnmCrQlnFjrQ 7uXi07tVDxk96f7olaWzNmhUsupNffXR2Uj56qo/OkR0rnzYQSzA2SlInBCutTRtUyyz CSbFl72gDuGLaljx091WhcoxEzTFTskPaS/HnYin/05dnm/qp2LxbppQgq1otylMPOul HDGtzPJTGX1RMXX+jUeqLYqNjGnz0pgUJkg1Z0KLMg4muxtiHDpMOnQ2gp14jRoc/gMR cIIA== 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=mkW6rZp7; 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 p17si3146830wrh.58.2018.03.01.11.26.57; Thu, 01 Mar 2018 11:26:57 -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=mkW6rZp7; 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 089C8267BAE; Thu, 1 Mar 2018 20:26:27 +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 C560E267BAB; Thu, 1 Mar 2018 20:26:24 +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 0A0E3267BA9 for ; Thu, 1 Mar 2018 20:26:22 +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=Wkw/i10INa3dQ54kpaLzdjl+Fd7B3WLRCZJOQ3BZH0Q=; b=mkW6rZp7QGhV FWhCxVcuESGiApnS9xkSsTXZTxXNBOkTV8gK8Ht+L6iwSBp7G4tBVRaefFXPceI3JqlsLcQO3ZP4l xjFjtJ2hXu+UEQWktT1kYhs1fi/aKObXr/Um66qjXcoVsQiJvFCOk/4E/Pfp64Z+GqxDmUgIZkqlp 3uw+k=; 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 1erTqI-0005jH-7s; Thu, 01 Mar 2018 19:26:14 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erTqH-0001XJ-PS; Thu, 01 Mar 2018 19:26:13 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180225104713.4745-11-hdegoede@redhat.com> Message-Id: Date: Thu, 01 Mar 2018 19:26:13 +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: Do not modify jd and PLL power bits from set_bias_level()" 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: Do not modify jd and PLL power bits from set_bias_level() 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 887fcc6f0514380f17d5016dd8cdfc4d9a4437ee Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 25 Feb 2018 11:46:51 +0100 Subject: [PATCH] ASoC: rt5651: Do not modify jd and PLL power bits from set_bias_level() rt5651_set_bias_level(BIAS_OFF) used to unconditionally clear the entire register, including the jack-detect and PLL power bits. When jack-detection support was introduced a special case for jack-detect was added which hard-codes a register value to keep both on. This commit removes the jack-detect special case, instead simply leaving these bits as is on BIAS_OFF. Tested-by: Carlo Caione Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/codecs/rt5651.c | 10 +++------- 1 file changed, 3 insertions(+), 7 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 c93539ee2200..d4fb16686889 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1521,8 +1521,6 @@ static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5651_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component); - switch (level) { case SND_SOC_BIAS_PREPARE: if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) { @@ -1558,11 +1556,9 @@ static int rt5651_set_bias_level(struct snd_soc_component *component, /* Do not touch the LDO voltage select bits on bias-off */ snd_soc_component_update_bits(component, RT5651_PWR_ANLG1, ~RT5651_PWR_LDO_DVO_MASK, 0); - if (rt5651->jd_src) { - snd_soc_component_write(component, RT5651_PWR_ANLG2, 0x0204); - } else { - snd_soc_component_write(component, RT5651_PWR_ANLG2, 0x0000); - } + /* Leave PLL1 and jack-detect power as is, all others off */ + snd_soc_component_update_bits(component, RT5651_PWR_ANLG2, + ~(RT5651_PWR_PLL | RT5651_PWR_JD_M), 0); break; default: