* [PATCH] ASoC: adau1701: Use gpio_set_value_cansleep()
@ 2013-08-11 14:15 Mark Brown
2013-08-12 8:33 ` Lars-Peter Clausen
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2013-08-11 14:15 UTC (permalink / raw)
To: Lars-Peter Clausen, Liam Girdwood
Cc: alsa-devel, linaro-kernel, device-drivers-devel, Mark Brown
From: Mark Brown <broonie@linaro.org>
The GPIO manipulation done by this driver is never in atomic context so
we can use gpio_set_value_cansleep() and support GPIOs that can't be set
from atomic context.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/adau1701.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index 2c10252..ebff112 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -247,21 +247,21 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
gpio_is_valid(adau1701->gpio_pll_mode[1])) {
switch (clkdiv) {
case 64:
- gpio_set_value(adau1701->gpio_pll_mode[0], 0);
- gpio_set_value(adau1701->gpio_pll_mode[1], 0);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0);
break;
case 256:
- gpio_set_value(adau1701->gpio_pll_mode[0], 0);
- gpio_set_value(adau1701->gpio_pll_mode[1], 1);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1);
break;
case 384:
- gpio_set_value(adau1701->gpio_pll_mode[0], 1);
- gpio_set_value(adau1701->gpio_pll_mode[1], 0);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0);
break;
case 0: /* fallback */
case 512:
- gpio_set_value(adau1701->gpio_pll_mode[0], 1);
- gpio_set_value(adau1701->gpio_pll_mode[1], 1);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1);
+ gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1);
break;
}
}
@@ -269,10 +269,10 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
adau1701->pll_clkdiv = clkdiv;
if (gpio_is_valid(adau1701->gpio_nreset)) {
- gpio_set_value(adau1701->gpio_nreset, 0);
+ gpio_set_value_cansleep(adau1701->gpio_nreset, 0);
/* minimum reset time is 20ns */
udelay(1);
- gpio_set_value(adau1701->gpio_nreset, 1);
+ gpio_set_value_cansleep(adau1701->gpio_nreset, 1);
/* power-up time may be as long as 85ms */
mdelay(85);
}
--
1.8.4.rc1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ASoC: adau1701: Use gpio_set_value_cansleep()
2013-08-11 14:15 [PATCH] ASoC: adau1701: Use gpio_set_value_cansleep() Mark Brown
@ 2013-08-12 8:33 ` Lars-Peter Clausen
0 siblings, 0 replies; 2+ messages in thread
From: Lars-Peter Clausen @ 2013-08-12 8:33 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, linaro-kernel, Liam Girdwood, device-drivers-devel,
Mark Brown
On 08/11/2013 04:15 PM, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> The GPIO manipulation done by this driver is never in atomic context so
> we can use gpio_set_value_cansleep() and support GPIOs that can't be set
> from atomic context.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Thanks.
> ---
> sound/soc/codecs/adau1701.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
> index 2c10252..ebff112 100644
> --- a/sound/soc/codecs/adau1701.c
> +++ b/sound/soc/codecs/adau1701.c
> @@ -247,21 +247,21 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
> gpio_is_valid(adau1701->gpio_pll_mode[1])) {
> switch (clkdiv) {
> case 64:
> - gpio_set_value(adau1701->gpio_pll_mode[0], 0);
> - gpio_set_value(adau1701->gpio_pll_mode[1], 0);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0);
> break;
> case 256:
> - gpio_set_value(adau1701->gpio_pll_mode[0], 0);
> - gpio_set_value(adau1701->gpio_pll_mode[1], 1);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1);
> break;
> case 384:
> - gpio_set_value(adau1701->gpio_pll_mode[0], 1);
> - gpio_set_value(adau1701->gpio_pll_mode[1], 0);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0);
> break;
> case 0: /* fallback */
> case 512:
> - gpio_set_value(adau1701->gpio_pll_mode[0], 1);
> - gpio_set_value(adau1701->gpio_pll_mode[1], 1);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1);
> + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1);
> break;
> }
> }
> @@ -269,10 +269,10 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
> adau1701->pll_clkdiv = clkdiv;
>
> if (gpio_is_valid(adau1701->gpio_nreset)) {
> - gpio_set_value(adau1701->gpio_nreset, 0);
> + gpio_set_value_cansleep(adau1701->gpio_nreset, 0);
> /* minimum reset time is 20ns */
> udelay(1);
> - gpio_set_value(adau1701->gpio_nreset, 1);
> + gpio_set_value_cansleep(adau1701->gpio_nreset, 1);
> /* power-up time may be as long as 85ms */
> mdelay(85);
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-12 8:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-11 14:15 [PATCH] ASoC: adau1701: Use gpio_set_value_cansleep() Mark Brown
2013-08-12 8:33 ` Lars-Peter Clausen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.