From patchwork Thu Mar 1 19:25:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130395 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3189756edc; Thu, 1 Mar 2018 11:26:37 -0800 (PST) X-Google-Smtp-Source: AG47ELsvP1fOP9e2QKrE/g/1TEfPJY5EpvnZCRw1GHBYdYQgBuGQmNSCJNig68Qlmnb4qM3zsCdV X-Received: by 10.28.11.147 with SMTP id 141mr2553434wml.138.1519932396963; Thu, 01 Mar 2018 11:26:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519932396; cv=none; d=google.com; s=arc-20160816; b=Jwr9xy88I1Ct90/tVjThIrTTZXxpzPYHhmK8uiP+tK4nfqsVlPNdycVy6F+MaaWusw lsQaULrNFekjFPSIlNNP3Dn6+edPdWkNaxiE1HombjmCtjZI9rMWjiROnnKIKaBY1GLQ zbQf2Y1SWB7/Sa3kea4RvhHECApCxfWgK3RiSoDaf5q2/jSRnD8ROXL5wM5BKmDPdYYd MXOFewL2OkvcRFo+gm1sAwpSK9ZvCzYTJ/0XX5L5i48ccjYMDLS1UFdSZtL0qkrgk+te mbtFvnIXysWTvWjXgrSsPWj0tRJh/wh6WbzVZZVBJdX0p0Uq1L9uGUuIWUPCxoVq8PoU ndMw== 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=qquIT/VPXTn3Xo14dGBrxxcGowhHHOQ9DLHgBU6C950=; b=D2WC74WSmT8iucRyPt+0xX/z29jpo2MTlNzDNRGt+LSkePpUJlTZIgKRy6s3A5d9k8 aiD5wf/hPKipxuudQHzN4hP3cMKIm7rXJRjoQ88z1E+CKoX1uje3hQxkNbqaer2/JBdV VW29KOLjr1lcCdkrHCnc/1Sx67/ODCt04ytQlDbzWxycwTOBSgnbPlQJWWsaHWAJbdBe 6uAE7m5b85+FZyqca1sS3XtT/TccqcdU68jy6SuwVxrXYJAqzTg4UgO+P+nPjCoGShGT qBWalk2DuJv9U+8qZhbp2rdv/2Wa8s/mr3e+mmF7GI/Z6yrDD5HHuvRBi8NJnMFuRFrg HnGw== 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=IU6VjnTh; 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 z30si3179812wrc.139.2018.03.01.11.26.36; Thu, 01 Mar 2018 11:26:36 -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=IU6VjnTh; 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 7CD64267B9D; Thu, 1 Mar 2018 20:26:10 +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 7439A267B9E; Thu, 1 Mar 2018 20:26:08 +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=2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, TVD_SUBJ_WIPE_DEBT, 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 DD3F6267B99 for ; Thu, 1 Mar 2018 20:26:06 +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=QqFWH1XKwKxAyPPtWzJ8z0XN/sQDNhDkaVcuoQFlc+I=; b=IU6VjnThGUuR 3l0Ga3piOWKFIlyN3MryR2vTthLl5+XAsNAKUKIPNfc1nZZqMvT/C4LVYR+3TuMIATVrYlMJZcMD5 PrI1Njsge9E2Ok/lIo0mvzQU2CFNU/2owVbmMTV8N2k9GM+ACwSXd7HcfZV85u1++c11ddP5ksH3/ RX5ZU=; 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 1erTq2-0005ij-Fc; Thu, 01 Mar 2018 19:25:58 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erTq2-0001U3-0x; Thu, 01 Mar 2018 19:25:58 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180225104713.4745-14-hdegoede@redhat.com> Message-Id: Date: Thu, 01 Mar 2018 19:25:58 +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: Remove "JD Power" dapm supply" 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: Remove "JD Power" dapm supply 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 57d9d7c32fc24ca4de49392fec1fdd3db1f58e92 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 25 Feb 2018 11:46:54 +0100 Subject: [PATCH] ASoC: rt5651: Remove "JD Power" dapm supply Remove the "JD power" dapm supply which gets force-enabled once when using jack-detect and never gets disabled again. Since the PWR_JD_M bit simply needs to be always on when using jack-detect there is no need to have it tracked by dapm, instead we can simply set it to 1 once when initializing the jack-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, 4 insertions(+), 5 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 9460bdcad349..cbf9f56ecb14 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -869,10 +869,6 @@ static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY_S("ADC ASRC", 1, RT5651_PLL_MODE_2, 11, 0, NULL, 0), - /* Input Side */ - SND_SOC_DAPM_SUPPLY("JD Power", RT5651_PWR_ANLG2, - RT5651_PWM_JD_M_BIT, 0, NULL, 0), - /* micbias */ SND_SOC_DAPM_SUPPLY("LDO", RT5651_PWR_ANLG1, RT5651_PWR_LDO_BIT, 0, NULL, 0), @@ -1616,7 +1612,10 @@ static int rt5651_set_jack(struct snd_soc_component *component, return -EINVAL; } - snd_soc_dapm_force_enable_pin(dapm, "JD Power"); + /* Enable jack detect power */ + snd_soc_component_update_bits(component, RT5651_PWR_ANLG2, + RT5651_PWR_JD_M, RT5651_PWR_JD_M); + snd_soc_dapm_force_enable_pin(dapm, "LDO"); snd_soc_dapm_sync(dapm);