summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch
blob: 559e49f40aa9d5eeecf8dff7984252e3d238018a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From 2710416c43572652cb5355a5eaf68038c95659e8 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Thu, 9 Apr 2009 12:10:46 +0300
Subject: [PATCH] DSS2: Beagle: Use gpio_set_value

---
 arch/arm/mach-omap2/board-omap3beagle.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index b67e7a5..8c1961d 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -372,7 +372,7 @@ static struct platform_device keys_gpio = {
 static int beagle_enable_dvi(struct omap_display *display)
 {
 	if (display->hw_config.panel_reset_gpio != -1)
-		gpio_direction_output(display->hw_config.panel_reset_gpio, 1);
+		gpio_set_value(display->hw_config.panel_reset_gpio, 1);
 
 	return 0;
 }
@@ -380,7 +380,7 @@ static int beagle_enable_dvi(struct omap_display *display)
 static void beagle_disable_dvi(struct omap_display *display)
 {
 	if (display->hw_config.panel_reset_gpio != -1)
-		gpio_direction_output(display->hw_config.panel_reset_gpio, 0);
+		gpio_set_value(display->hw_config.panel_reset_gpio, 0);
 }
 
 static struct omap_dss_display_config beagle_display_data_dvi = {
@@ -445,8 +445,12 @@ static void __init beagle_display_init(void)
 	int r;
 
 	r = gpio_request(beagle_display_data_dvi.panel_reset_gpio, "DVI reset");
-	if (r < 0)
+	if (r < 0) {
 		printk(KERN_ERR "Unable to get DVI reset GPIO\n");
+		return;
+	}
+
+	gpio_direction_output(beagle_display_data_dvi.panel_reset_gpio, 0);
 }
 
 static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
-- 
1.5.6.5