aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/h3600.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
-rw-r--r--arch/arm/mach-sa1100/h3600.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 47587cce0000..af3b71459f8d 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -27,14 +27,22 @@
27 */ 27 */
28static void h3600_lcd_power(int enable) 28static void h3600_lcd_power(int enable)
29{ 29{
30 if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power")) 30 if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power")) {
31 pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);
31 goto err1; 32 goto err1;
32 if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control")) 33 }
34 if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control")) {
35 pr_err("%s: can't request H3XXX_EGPIO_LCD_PCI\n", __func__);
33 goto err2; 36 goto err2;
34 if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v")) 37 }
38 if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v")) {
39 pr_err("%s: can't request H3XXX_EGPIO_LCD_5V_ON\n", __func__);
35 goto err3; 40 goto err3;
36 if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v")) 41 }
42 if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v")) {
43 pr_err("%s: can't request H3600_EGPIO_LVDD_ON\n", __func__);
37 goto err4; 44 goto err4;
45 }
38 46
39 gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable); 47 gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);
40 gpio_direction_output(H3600_EGPIO_LCD_PCI, enable); 48 gpio_direction_output(H3600_EGPIO_LCD_PCI, enable);