From: "Andrew F. Davis" <afd@ti.com>
To: "Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Benoît Cousson" <bcousson@baylibre.com>,
"Tony Lindgren" <tony@atomide.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <kernel@pengutronix.de>
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
linux-kernel@vger.kernel.org, "Andrew F . Davis" <afd@ti.com>
Subject: [PATCH v2 3/8] ASoC: tlv320aic31xx: Fix the reset GPIO OF name
Date: Wed, 29 Nov 2017 11:13:54 -0600 [thread overview]
Message-ID: <20171129171359.29382-4-afd@ti.com> (raw)
In-Reply-To: <20171129171359.29382-1-afd@ti.com>
The correct DT property for specifying a GPIO used for reset
is "reset-gpios", fix this here.
Fixes: e00447fafbf7 ("ASoC: tlv320aic31xx: Add basic codec driver implementation")
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
sound/soc/codecs/tlv320aic31xx.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
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)
--
2.15.0
next prev parent reply other threads:[~2017-11-29 17:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 17:13 [PATCH v2 0/8] Remove use of "gpio-reset" from DT Andrew F. Davis
[not found] ` <20171129171359.29382-1-afd-l0cyMroinI0@public.gmane.org>
2017-11-29 17:13 ` [PATCH v2 1/8] ASoC: tlv320aic31xx: Fix typo in DT binding documentation Andrew F. Davis
[not found] ` <20171129171359.29382-2-afd-l0cyMroinI0@public.gmane.org>
2017-11-30 11:43 ` Mark Brown
2017-11-30 12:33 ` Applied "ASoC: tlv320aic31xx: Rename property for reset GPIO" to the asoc tree Mark Brown
2017-11-29 17:13 ` [PATCH v2 2/8] ASoC: tlv320aic3x: Fix typo in DT binding documentation Andrew F. Davis
2017-11-30 12:33 ` Applied "ASoC: tlv320aic3x: Rename property for reset GPIO" to the asoc tree Mark Brown
2017-11-29 17:13 ` [PATCH v2 8/8] ARM: dts: omap3-n900: Fix the audio CODEC's reset pin Andrew F. Davis
2017-11-29 17:13 ` Andrew F. Davis [this message]
2017-11-30 12:33 ` Applied "ASoC: tlv320aic31xx: Use standard reset GPIO OF name" to the asoc tree Mark Brown
2017-11-29 17:13 ` [PATCH v2 4/8] ASoC: tlv320aic3x: Fix the reset GPIO OF name Andrew F. Davis
2017-11-30 12:33 ` Applied "ASoC: tlv320aic3x: Use standard reset GPIO OF name" to the asoc tree Mark Brown
2017-11-29 17:13 ` [PATCH v2 5/8] ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin Andrew F. Davis
2017-11-30 16:18 ` Tony Lindgren
[not found] ` <20171130161826.GP28152-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2017-11-30 16:33 ` Mark Brown
2017-11-30 16:37 ` Andrew F. Davis
2017-11-30 16:53 ` Mark Brown
2017-11-30 17:00 ` Tony Lindgren
2017-11-29 17:13 ` [PATCH v2 6/8] ARM: dts: imx6: RDU2: " Andrew F. Davis
2017-11-29 17:13 ` [PATCH v2 7/8] ARM: dts: imx: " Andrew F. Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171129171359.29382-4-afd@ti.com \
--to=afd@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=bcousson@baylibre.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).