From patchwork Thu Mar 1 19:26:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130398 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3190212edc; Thu, 1 Mar 2018 11:27:06 -0800 (PST) X-Google-Smtp-Source: AH8x226t0KPW/p/fSShqdemSXuYEYcc9T3CXOAtGi3k77rjA7ji816ECjiGnENxmj591/j28davO X-Received: by 10.28.207.207 with SMTP id f198mr3374384wmg.0.1519932426420; Thu, 01 Mar 2018 11:27:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519932426; cv=none; d=google.com; s=arc-20160816; b=fj7IgmGjj2eCEOFclALdTVDV4JBeU6XmCgE9YQBrLybsxfcw6fdL2U7eu8ETcQeraX jvKQDZ3rCEvbj1dFhQZ0KqS3LpVtpwKus/cjBccIST8z1RbJ0vhEYiBbPab5w4O0r9/5 wt1nD9aFh7vjXWWLXoNmKKzCWryILjOWs6KfkavtDAsl9G/12QjjoyQHY8i6b8inABVJ VfWB4E9Y1Tqnhr40KBhw2zDd9rNP/1Q9KdutUNUzKWmGaw56fEKeRQLSJZRpFFEEorx7 6JUAE3LBrVqi72qsjUY7l6TqTIHzkk2yKXFkgaxEveTX9mJCbya37Phw9jOiwvVaG67W CAJw== 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=ROeKHeNxMAwYO49rYxz731XeS0eXKfbO1OKAslT7638=; b=i/2NmASQByVnTA/pgZGd3dscLD+RYnqhNS/LMQhRf9VtGgJnd+t+FSEJAS82enl0s6 5nvn10NvQGMaWtNDBcKynUKaIfxSZy/qmog+VzGVMvd7ahkgNMHs74Xv/FZyALkO10i6 gdctO8GubyzMHBWblgJ/9hvkVnBcC1GVAwGMzmPIQqDWhqcnvCeOIn0j3T2o+mykfFev oJ6R2440CGeut/aylkokUZpBBXMa1Vm80oFv+VdvB8FM2BOPMPazhGdW/2WtTi6q5+de MQ9UFGUYMsSilXqZURwWP2TtlA2iO7XGVk0/ay9NJK7N1z6OkXZmR3rg2kPiMNrWVGav 5Wjw== 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=XxO9AZPk; 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 j134si3085227wmd.26.2018.03.01.11.27.06; Thu, 01 Mar 2018 11:27:06 -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=XxO9AZPk; 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 84A5F267BB2; Thu, 1 Mar 2018 20:26:33 +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 709ED267BB3; Thu, 1 Mar 2018 20:26:29 +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 B475F267BAC for ; Thu, 1 Mar 2018 20:26:25 +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=PDRkGM7FTH+ZnIyMcBrqX+7VG75uHIqIu/wdFe47rqU=; b=XxO9AZPke0Ha tkEPP4nA5XORtTz4HS+f1cn5l2wk1ryTv5Pz2CU6cOuQhwykgAm7qdF7Df7iQgjyWu350o+VkOvwa EXBTxmKHxSPqEifM9fZSsy6J9lK9rJ76MTvMkS90HZibiVOjsrdrnafHIktXu0hm84/8/0HIJEdU7 cY8PY=; 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 1erTqL-0005jO-CW; Thu, 01 Mar 2018 19:26:17 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erTqK-0001YJ-Tt; Thu, 01 Mar 2018 19:26:16 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180225104713.4745-10-hdegoede@redhat.com> Message-Id: Date: Thu, 01 Mar 2018 19:26:16 +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 the LDO voltage control 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 the LDO voltage control 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 bba4e685dae8643469ca6fac22f10ca81554586e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 25 Feb 2018 11:46:50 +0100 Subject: [PATCH] ASoC: rt5651: Do not modify the LDO voltage control bits from set_bias_level() The PWR_ANLG1 reg not only contains various power on/off bits, it also contains 2 bits which select if the LDO generates 1.0, 1.1 or 1.2V. Note there is a separate on/off bit for the LDO. rt5651_set_bias_level(BIAS_OFF) used to unconditionally clear the entire register, when jack-detection support was introduced a special case for jack-detect was added which hard-codes a register value to keep the LDO voltage at 1.2 volt. This commit removes the jack-detect special case, instead simply always leaving the LDO voltage control 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 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 c565607f95f7..c93539ee2200 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1555,11 +1555,12 @@ static int rt5651_set_bias_level(struct snd_soc_component *component, snd_soc_component_write(component, RT5651_PWR_DIG2, 0x0000); snd_soc_component_write(component, RT5651_PWR_VOL, 0x0000); snd_soc_component_write(component, RT5651_PWR_MIXER, 0x0000); + /* 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); - snd_soc_component_write(component, RT5651_PWR_ANLG1, 0x0002); } else { - snd_soc_component_write(component, RT5651_PWR_ANLG1, 0x0000); snd_soc_component_write(component, RT5651_PWR_ANLG2, 0x0000); } break;