diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-06 12:31:41 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-06 12:31:41 -0800 |
| commit | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b (patch) | |
| tree | ccc18e9d71bb1b9dc1a69a2ba7ff18d8e376f7b3 /arch/arm/mach-s5pv210/mach-smdkv210.c | |
| parent | 8a44930a11de8d66f92145fd2d2464ab4fba696b (diff) | |
| parent | 321655efad26e03141b0bbfcfa9875056c1acb65 (diff) | |
| download | blackbird-op-linux-65db039bf7402f0a5b19cbf6dcff55ebea433b8b.tar.gz blackbird-op-linux-65db039bf7402f0a5b19cbf6dcff55ebea433b8b.zip | |
Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkv210.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 8662ef6e5681..513db9234c41 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c @@ -153,15 +153,12 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd, { if (power) { #if !defined(CONFIG_BACKLIGHT_PWM) - gpio_request(S5PV210_GPD0(3), "GPD0"); - gpio_direction_output(S5PV210_GPD0(3), 1); + gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0"); gpio_free(S5PV210_GPD0(3)); #endif /* fire nRESET on power up */ - gpio_request(S5PV210_GPH0(6), "GPH0"); - - gpio_direction_output(S5PV210_GPH0(6), 1); + gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0"); gpio_set_value(S5PV210_GPH0(6), 0); mdelay(10); @@ -172,8 +169,7 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd, gpio_free(S5PV210_GPH0(6)); } else { #if !defined(CONFIG_BACKLIGHT_PWM) - gpio_request(S5PV210_GPD0(3), "GPD0"); - gpio_direction_output(S5PV210_GPD0(3), 0); + gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0"); gpio_free(S5PV210_GPD0(3)); #endif } |
