sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

sunxi: display: Fix gpio handling to work with the driver-model 

The driver-model gpio functions may return another value then -1 as error,
make the sunxi display code properly handle this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2015-04-22 17:45:59 +02:00
parent a725426929
commit 1572819c5f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/video/sunxi_display.c
View File

@ -600,19 +600,19 @@ static void sunxi_lcdc_panel_enable(void)
* white while the lcd inits. * white while the lcd inits.
*/ */
pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_EN); pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_EN);
if (pin != -1) { if (pin >= 0) {
gpio_request(pin, "lcd_backlight_enable"); gpio_request(pin, "lcd_backlight_enable");
gpio_direction_output(pin, 0); gpio_direction_output(pin, 0);
} }
pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_PWM); pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_PWM);
if (pin != -1) { if (pin >= 0) {
gpio_request(pin, "lcd_backlight_pwm"); gpio_request(pin, "lcd_backlight_pwm");
gpio_direction_output(pin, PWM_OFF); gpio_direction_output(pin, PWM_OFF);
} }
reset_pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_RESET); reset_pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_RESET);
if (reset_pin != -1) { if (reset_pin >= 0) {
gpio_request(reset_pin, "lcd_reset"); gpio_request(reset_pin, "lcd_reset");
gpio_direction_output(reset_pin, 0); /* Assert reset */ gpio_direction_output(reset_pin, 0); /* Assert reset */
} }
@ -620,12 +620,12 @@ static void sunxi_lcdc_panel_enable(void)
/* Give the backlight some time to turn off and power up the panel. */ /* Give the backlight some time to turn off and power up the panel. */
mdelay(40); mdelay(40);
pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_POWER); pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_POWER);
if (pin != -1) { if (pin >= 0) {
gpio_request(pin, "lcd_power"); gpio_request(pin, "lcd_power");
gpio_direction_output(pin, 1); gpio_direction_output(pin, 1);
} }
if (reset_pin != -1) if (reset_pin >= 0)
gpio_direction_output(reset_pin, 1); /* De-assert reset */ gpio_direction_output(reset_pin, 1); /* De-assert reset */
} }
@ -640,11 +640,11 @@ static void sunxi_lcdc_backlight_enable(void)
mdelay(40); mdelay(40);
pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_EN); pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_EN);
if (pin != -1) if (pin >= 0)
gpio_direction_output(pin, 1); gpio_direction_output(pin, 1);
pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_PWM); pin = sunxi_name_to_gpio(CONFIG_VIDEO_LCD_BL_PWM);
if (pin != -1) if (pin >= 0)
gpio_direction_output(pin, PWM_ON); gpio_direction_output(pin, PWM_ON);
} }
@ -961,7 +961,7 @@ static void sunxi_vga_external_dac_enable(void)
int pin; int pin;
pin = sunxi_name_to_gpio(CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN); pin = sunxi_name_to_gpio(CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN);
if (pin != -1) { if (pin >= 0) {
gpio_request(pin, "vga_enable"); gpio_request(pin, "vga_enable");
gpio_direction_output(pin, 1); gpio_direction_output(pin, 1);
} }