From patchwork Thu Nov 30 12:33:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120172 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp608413qgn; Thu, 30 Nov 2017 04:34:41 -0800 (PST) X-Google-Smtp-Source: AGs4zMZkAnfFngbYfXofkehNDRTInfmJb6p3xqLqU2FNMOJpkWdPUlFvlcX3V6QR0cvIXdb7d0Vn X-Received: by 10.28.208.198 with SMTP id h189mr423166wmg.25.1512045281341; Thu, 30 Nov 2017 04:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512045281; cv=none; d=google.com; s=arc-20160816; b=ao850EBlj7xxwQHa5YVcHvDuFT/clSawah4xuzx+LMDj2Z57pFceO4DWRWSDdHdA1k /DMARif1Shn5BNuDIobwiqTDHsn0vv+S9RhdoO3bMrqXP41mUYiSp/DmnpA9IVGh1oJ+ gTciBJH8fzGaHiV1y1T0v3q6PCzvqgtct/Okjl/pfaqMy/sW9U8B4FQvIDLYqdxqW/sM DXOmQkyBhdKfLVWgKJ74MwAVrCxudTpeZzwGxiSia4RBVDJzrwBWfAgx33MvDZHCs6mH tDpj6alr301uWVShAgBNX/GZrlWUdLzYJTBCya+HO+eGO2HhEGRqhD+Nzgfsk/pns4Oe FXwQ== 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=ZuhxjyxoyTq1BIcE406LhsovCoF9/YDCmMLl+veF8f4=; b=J6uQYcyxLwcZ0xMDCPpvFwL7t8POw+j02W7Ls2ieWtvzUwMwEBIYe+KUUgew8l0iww xqEtVopHQy3ZOmClR99dAXiUcr2/HyAbaF2HKVMtfAxAE3LfgfOGW1q40I9x4aLye2NT G8LijP7EzSXdLzTcXwi7N/IyYDQ01rHNH6SbYYTOHpxMLf7pRTxuQ88xsbkToRgLWssq Jk1FpS1lJ7iNZFLr9n9DNTVWg+ZHpvZrPo4SOj8O2JnnIlmEiPna57b0Bg0p8M/pkF19 R+nyfTt6p2nwsSvaOnReKKYL9aK3pGfZDma7+IDLLIshzpaJ4yNO0mibmDBK01SNfVMp 12cQ== 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=e+M1SKsD; 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 k18si3038930wmd.246.2017.11.30.04.34.39; Thu, 30 Nov 2017 04:34:41 -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=e+M1SKsD; 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 8C4692679FC; Thu, 30 Nov 2017 13:33:40 +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 05DD4267AED; Thu, 30 Nov 2017 13:33:39 +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.0 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 839F32679D3 for ; Thu, 30 Nov 2017 13:33:20 +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=nIyG0ysvlsJSazx/IUQi9H6Ulmj7Yix0QCJx/ZBXOUg=; b=e+M1SKsDxCpd iHO2qm7B000THp9CR2hFov+fSiBcrxW5IizVSt+8hUQEHcT/988ghczVuXmZO55JpTUlhei72zrBo d3gWC+jAb0Y7QqdoyAb4n53q4gLG9zCdfur76WpDdDo8IKiAfKoppx0TJpzBjRCyDNAc/NbqNa7sY 75I1Q=; 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 1eKO1i-0003Gl-U0; Thu, 30 Nov 2017 12:33:15 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eKO1i-0000cz-GY; Thu, 30 Nov 2017 12:33:14 +0000 From: Mark Brown To: Andrew F. Davis In-Reply-To: <20171129171359.29382-4-afd@ti.com> Message-Id: Date: Thu, 30 Nov 2017 12:33:14 +0000 Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Sascha Hauer , Tony Lindgren , Liam Girdwood , Rob Herring , linux-kernel@vger.kernel.org, Mark Brown , =?utf-8?q?Beno=C3=AEt_Cousson?= , "Andrew F . Davis" , Shawn Guo Subject: [alsa-devel] Applied "ASoC: tlv320aic31xx: Use standard reset GPIO OF name" 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: tlv320aic31xx: Use standard reset GPIO OF name 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 a825f31f93281bbe7126b25801deb476d07aaf82 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Wed, 29 Nov 2017 11:13:54 -0600 Subject: [PATCH] ASoC: tlv320aic31xx: Use standard reset GPIO OF name The correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here. [Retitled for accuracy -- broonie] Signed-off-by: Andrew F. Davis Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic31xx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.15.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index e2862372c26e..4837f25b0760 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1279,9 +1279,16 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx) aic31xx->pdata.micbias_vg = MICBIAS_2_0V; } - ret = of_get_named_gpio(np, "gpio-reset", 0); - if (ret > 0) + ret = of_get_named_gpio(np, "reset-gpios", 0); + if (ret > 0) { aic31xx->pdata.gpio_reset = ret; + } else { + ret = of_get_named_gpio(np, "gpio-reset", 0); + if (ret > 0) { + dev_warn(aic31xx->dev, "Using deprecated property \"gpio-reset\", please update your DT"); + aic31xx->pdata.gpio_reset = ret; + } + } } #else /* CONFIG_OF */ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx)