summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/mach-smdkv310.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-01-06 21:31:41 +0100
committerOlof Johansson <olof@lixom.net>2012-01-06 21:31:41 +0100
commit65db039bf7402f0a5b19cbf6dcff55ebea433b8b (patch)
treeccc18e9d71bb1b9dc1a69a2ba7ff18d8e376f7b3 /arch/arm/mach-exynos/mach-smdkv310.c
parentMerge branch 'next-samsung-cleanup-spi4' of git://git.kernel.org/pub/scm/linu... (diff)
parentARM: EXYNOS: Use gpio_request_one (diff)
downloadlinux-65db039bf7402f0a5b19cbf6dcff55ebea433b8b.tar.xz
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-exynos/mach-smdkv310.c')
-rw-r--r--arch/arm/mach-exynos/mach-smdkv310.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index cec2afabe7b4..cbf31bd0e2c9 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -129,9 +129,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd,
gpio_free(EXYNOS4_GPD0(1));
#endif
/* fire nRESET on power up */
- gpio_request(EXYNOS4_GPX0(6), "GPX0");
-
- gpio_direction_output(EXYNOS4_GPX0(6), 1);
+ gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0");
mdelay(100);
gpio_set_value(EXYNOS4_GPX0(6), 0);