ASoC: wm0010: Allow slow GPIO for reset
Subsystems (3)
PATCH 1/3 ASoC: wm0010: Allow slow GPIO for reset
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 <[email protected]>
--- sound/soc/codecs/wm0010.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/soc/codecs/wm0010.c +5 -3
@@ -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)
Signature · 1 line
1.7.10.4
PATCH 2/3 ASoC: wm0010: Don't check if reset GPIO is defined when removing
We will fail to probe without one.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm0010.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
sound/soc/codecs/wm0010.c +2 -5
@@ -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);
Signature · 1 line
1.7.10.4
PATCH 3/3 ASoC: wm0010: Initialise chip state before we register the interrupt
In reply to Mark BrownThe interrupt handler uses the chip state.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm0010.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
sound/soc/codecs/wm0010.c +2 -5
@@ -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));
Signature · 1 line
1.7.10.4