* [PATCH] ASoC: Convert e740_wm9705 to use gpio_request_one()
@ 2011-12-05 9:09 Axel Lin
2011-12-05 13:25 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-12-05 9:09 UTC (permalink / raw)
To: alsa-devel; +Cc: Ian Molton, Liam, Eric Miao, Girdwood, Mark Brown
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/pxa/e740_wm9705.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 35ed7eb8c..818dc57 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -146,29 +146,21 @@ static int __init e740_init(void)
if (!machine_is_e740())
return -ENODEV;
- ret = gpio_request(GPIO_E740_MIC_ON, "Mic amp");
+ /* Disable audio */
+ ret = gpio_request_one(GPIO_E740_MIC_ON, GPIOF_OUT_INIT_LOW, "Mic amp");
if (ret)
return ret;
- ret = gpio_request(GPIO_E740_AMP_ON, "Output amp");
+ ret = gpio_request_one(GPIO_E740_AMP_ON, GPIOF_OUT_INIT_LOW,
+ "Output amp");
if (ret)
goto free_mic_amp_gpio;
- ret = gpio_request(GPIO_E740_WM9705_nAVDD2, "Audio power");
+ ret = gpio_request_one(GPIO_E740_WM9705_nAVDD2, GPIOF_OUT_INIT_HIGH,
+ "Audio power");
if (ret)
goto free_op_amp_gpio;
- /* Disable audio */
- ret = gpio_direction_output(GPIO_E740_MIC_ON, 0);
- if (ret)
- goto free_apwr_gpio;
- ret = gpio_direction_output(GPIO_E740_AMP_ON, 0);
- if (ret)
- goto free_apwr_gpio;
- ret = gpio_direction_output(GPIO_E740_WM9705_nAVDD2, 1);
- if (ret)
- goto free_apwr_gpio;
-
e740_snd_device = platform_device_alloc("soc-audio", -1);
if (!e740_snd_device) {
ret = -ENOMEM;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: Convert e740_wm9705 to use gpio_request_one()
2011-12-05 9:09 [PATCH] ASoC: Convert e740_wm9705 to use gpio_request_one() Axel Lin
@ 2011-12-05 13:25 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2011-12-05 13:25 UTC (permalink / raw)
To: Axel Lin; +Cc: Ian Molton, alsa-devel, Eric Miao, Liam Girdwood
On Mon, Dec 05, 2011 at 05:09:11PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-05 13:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-05 9:09 [PATCH] ASoC: Convert e740_wm9705 to use gpio_request_one() Axel Lin
2011-12-05 13:25 ` 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).