diff options
Diffstat (limited to 'drivers/video/omap/lcd_osk.c')
-rw-r--r-- | drivers/video/omap/lcd_osk.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index a4a725f427a4..379c96d36da5 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |
31 | { | 31 | { |
32 | /* gpio2 was allocated in board init */ | ||
32 | return 0; | 33 | return 0; |
33 | } | 34 | } |
34 | 35 | ||
@@ -47,11 +48,8 @@ static int osk_panel_enable(struct lcd_panel *panel) | |||
47 | /* Set PWL level */ | 48 | /* Set PWL level */ |
48 | omap_writeb(0xFF, OMAP_PWL_ENABLE); | 49 | omap_writeb(0xFF, OMAP_PWL_ENABLE); |
49 | 50 | ||
50 | /* configure GPIO2 as output */ | 51 | /* set GPIO2 high (lcd power enabled) */ |
51 | omap_set_gpio_direction(2, 0); | 52 | gpio_set_value(2, 1); |
52 | |||
53 | /* set GPIO2 high */ | ||
54 | omap_set_gpio_dataout(2, 1); | ||
55 | 53 | ||
56 | return 0; | 54 | return 0; |
57 | } | 55 | } |
@@ -65,7 +63,7 @@ static void osk_panel_disable(struct lcd_panel *panel) | |||
65 | omap_writeb(0x00, OMAP_PWL_CLK_ENABLE); | 63 | omap_writeb(0x00, OMAP_PWL_CLK_ENABLE); |
66 | 64 | ||
67 | /* set GPIO2 low */ | 65 | /* set GPIO2 low */ |
68 | omap_set_gpio_dataout(2, 0); | 66 | gpio_set_value(2, 0); |
69 | } | 67 | } |
70 | 68 | ||
71 | static unsigned long osk_panel_get_caps(struct lcd_panel *panel) | 69 | static unsigned long osk_panel_get_caps(struct lcd_panel *panel) |