diff options
author | Liu Ying <b17645@freescale.com> | 2010-11-10 18:17:52 +0800 |
---|---|---|
committer | Scott Sweeny <scott.sweeny@timesys.com> | 2011-01-19 11:50:25 -0500 |
commit | fae57fcb8b956c9389d30cb373835bfea6c15a6b (patch) | |
tree | e8d337db63d8a7e22c5cac9e11499fbd7aff3285 /arch | |
parent | 0921d14f811da00981c220ae7f09f87b3c663000 (diff) |
ENGR00133318-3 MX53 EVK:Set TVin pwr gpio to be output in io_init
This patch sets TVin pwr gpio to be output in io_init.
Signed-off-by: Liu Ying <b17645@freescale.com>
(cherry picked from commit 342ab3082b255dc2c0fd386509e308c3ce5abf6a)
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx5/mx53_evk.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/mx53_evk.c b/arch/arm/mach-mx5/mx53_evk.c index cf5fb6530a92..6cf08f17426e 100644 --- a/arch/arm/mach-mx5/mx53_evk.c +++ b/arch/arm/mach-mx5/mx53_evk.c @@ -796,11 +796,11 @@ static void mx53_gpio_host1_driver_vbus(bool on) static void adv7180_pwdn(int pwdn) { gpio_request(MX53_TVIN_PWR, "tvin-pwr"); - gpio_direction_output(MX53_TVIN_PWR, 0); if (pwdn) gpio_set_value(MX53_TVIN_PWR, 0); else gpio_set_value(MX53_TVIN_PWR, 1); + gpio_free(MX53_TVIN_PWR); } static struct mxc_tvin_platform_data adv7180_data = { @@ -872,8 +872,8 @@ device_initcall(mxc_init_fb); static void camera_pwdn(int pwdn) { gpio_request(MX53_TVIN_PWR, "tvin-pwr"); - gpio_direction_output(MX53_TVIN_PWR, 0); gpio_set_value(MX53_TVIN_PWR, pwdn); + gpio_free(MX53_TVIN_PWR); } static struct mxc_camera_platform_data camera_data = { @@ -1572,6 +1572,10 @@ static void __init mx53_evk_io_init(void) msleep(5); gpio_set_value(MX53_TVIN_RESET, 1); + /* TVin power down */ + gpio_request(MX53_TVIN_PWR, "tvin-pwr"); + gpio_direction_output(MX53_TVIN_PWR, 0); + /* CAN1 enable GPIO*/ gpio_request(MX53_CAN1_EN1, "can1-en1"); gpio_direction_output(MX53_CAN1_EN1, 0); |