diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2011-02-14 16:20:20 +0100 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-02-15 22:53:59 +0100 |
| commit | d8ec598e5d0d66e68184664073e06b432e3dd140 (patch) | |
| tree | 290abe8073e9313c2b25a6627053b07d7fbb2971 /sound/soc/omap/rx51.c | |
| parent | Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
| download | linux-d8ec598e5d0d66e68184664073e06b432e3dd140.tar.xz linux-d8ec598e5d0d66e68184664073e06b432e3dd140.zip | |
ASoC: omap: rx51: Use gpio_request_one to configure tvout_sel gpio
Just slight cleanup to be sync with upcoming change.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/omap/rx51.c')
| -rw-r--r-- | sound/soc/omap/rx51.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 2d7d4115cb71..9411969d6f79 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -394,10 +394,10 @@ static int __init rx51_soc_init(void) if (!machine_is_nokia_rx51()) return -ENODEV; - err = gpio_request(RX51_TVOUT_SEL_GPIO, "tvout_sel"); + err = gpio_request_one(RX51_TVOUT_SEL_GPIO, + GPIOF_DIR_OUT | GPIOF_INIT_LOW, "tvout_sel"); if (err) goto err_gpio_tvout_sel; - gpio_direction_output(RX51_TVOUT_SEL_GPIO, 0); rx51_snd_device = platform_device_alloc("soc-audio", -1); if (!rx51_snd_device) { |