* [PATCH 1/3] ASoC: wm0010: Allow slow GPIO for reset
@ 2012-09-26 12:54 Mark Brown
2012-09-26 12:54 ` [PATCH 2/3] ASoC: wm0010: Don't check if reset GPIO is defined when removing Mark Brown
2012-09-26 12:54 ` [PATCH 3/3] ASoC: wm0010: Initialise chip state before we register the interrupt Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2012-09-26 12:54 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
We never set the GPIO from atomic context so there's no reason why we
can't support a GPIO that needs to sleep when configuring.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm0010.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index f8d6c31..4722acf 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -168,7 +168,8 @@ static void wm0010_halt(struct snd_soc_codec *codec)
case WM0010_STAGE2:
case WM0010_FIRMWARE:
/* Remember to put chip back into reset */
- gpio_set_value(wm0010->gpio_reset, wm0010->gpio_reset_value);
+ gpio_set_value_cansleep(wm0010->gpio_reset,
+ wm0010->gpio_reset_value);
/* Disable the regulators */
regulator_disable(wm0010->dbvdd);
regulator_bulk_disable(ARRAY_SIZE(wm0010->core_supplies),
@@ -387,7 +388,7 @@ static int wm0010_boot(struct snd_soc_codec *codec)
}
/* Release reset */
- gpio_set_value(wm0010->gpio_reset, !wm0010->gpio_reset_value);
+ gpio_set_value_cansleep(wm0010->gpio_reset, !wm0010->gpio_reset_value);
spin_lock_irqsave(&wm0010->irq_lock, flags);
wm0010->state = WM0010_OUT_OF_RESET;
spin_unlock_irqrestore(&wm0010->irq_lock, flags);
@@ -918,7 +919,8 @@ static int __devexit wm0010_spi_remove(struct spi_device *spi)
if (wm0010->gpio_reset) {
/* Remember to put chip back into reset */
- gpio_set_value(wm0010->gpio_reset, wm0010->gpio_reset_value);
+ gpio_set_value_cansleep(wm0010->gpio_reset,
+ wm0010->gpio_reset_value);
}
if (wm0010->irq)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/3] ASoC: wm0010: Don't check if reset GPIO is defined when removing
2012-09-26 12:54 [PATCH 1/3] ASoC: wm0010: Allow slow GPIO for reset Mark Brown
@ 2012-09-26 12:54 ` Mark Brown
2012-09-26 12:54 ` [PATCH 3/3] ASoC: wm0010: Initialise chip state before we register the interrupt Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2012-09-26 12:54 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
We will fail to probe without one.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm0010.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 4722acf..780110a 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -917,11 +917,8 @@ static int __devexit wm0010_spi_remove(struct spi_device *spi)
snd_soc_unregister_codec(&spi->dev);
- if (wm0010->gpio_reset) {
- /* Remember to put chip back into reset */
- gpio_set_value_cansleep(wm0010->gpio_reset,
- wm0010->gpio_reset_value);
- }
+ gpio_set_value_cansleep(wm0010->gpio_reset,
+ wm0010->gpio_reset_value);
if (wm0010->irq)
free_irq(wm0010->irq, wm0010);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3] ASoC: wm0010: Initialise chip state before we register the interrupt
2012-09-26 12:54 [PATCH 1/3] ASoC: wm0010: Allow slow GPIO for reset Mark Brown
2012-09-26 12:54 ` [PATCH 2/3] ASoC: wm0010: Don't check if reset GPIO is defined when removing Mark Brown
@ 2012-09-26 12:54 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2012-09-26 12:54 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
The interrupt handler uses the chip state.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm0010.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 780110a..99afc00 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -810,7 +810,6 @@ static int wm0010_probe(struct snd_soc_codec *codec)
static int __devinit wm0010_spi_probe(struct spi_device *spi)
{
- unsigned long flags;
unsigned long gpio_flags;
int ret;
int trigger;
@@ -877,6 +876,8 @@ static int __devinit wm0010_spi_probe(struct spi_device *spi)
return -EINVAL;
}
+ wm0010->state = WM0010_POWER_OFF;
+
irq = spi->irq;
if (wm0010->pdata.irq_flags)
trigger = wm0010->pdata.irq_flags;
@@ -898,10 +899,6 @@ static int __devinit wm0010_spi_probe(struct spi_device *spi)
else
wm0010->board_max_spi_speed = 0;
- spin_lock_irqsave(&wm0010->irq_lock, flags);
- wm0010->state = WM0010_POWER_OFF;
- spin_unlock_irqrestore(&wm0010->irq_lock, flags);
-
ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm0010, wm0010_dai,
ARRAY_SIZE(wm0010_dai));
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-26 12:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-26 12:54 [PATCH 1/3] ASoC: wm0010: Allow slow GPIO for reset Mark Brown
2012-09-26 12:54 ` [PATCH 2/3] ASoC: wm0010: Don't check if reset GPIO is defined when removing Mark Brown
2012-09-26 12:54 ` [PATCH 3/3] ASoC: wm0010: Initialise chip state before we register the interrupt Mark Brown
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).