tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight fixes from Lee Jones:
"This merely contains some very basic build/run-time bug fixes"

* tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: gpio-backlight: Fix warning when the GPIO is on a I2C chip
video/backlight: s6e63m0: Fix string type mismatch
video/backlight: LP8788 needs PWM
video/backlight: LP855X needs PWM
video/pxa: LCD_CORGI needs BACKLIGHT_CLASS_DEVICE
video/backlight: LM3630A needs PWM

Linus Torvalds af76004c bae14e7a

+7 -6
+4 -4
drivers/video/backlight/Kconfig
··· 29 29 30 30 config LCD_CORGI 31 31 tristate "LCD Panel support for SHARP corgi/spitz model" 32 - depends on SPI_MASTER && PXA_SHARPSL 32 + depends on SPI_MASTER && PXA_SHARPSL && BACKLIGHT_CLASS_DEVICE 33 33 help 34 34 Say y here to support the LCD panels usually found on SHARP 35 35 corgi (C7x0) and spitz (Cxx00) models. ··· 370 370 371 371 config BACKLIGHT_LM3630A 372 372 tristate "Backlight Driver for LM3630A" 373 - depends on BACKLIGHT_CLASS_DEVICE && I2C 373 + depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM 374 374 select REGMAP_I2C 375 375 help 376 376 This supports TI LM3630A Backlight Driver ··· 386 386 387 387 config BACKLIGHT_LP855X 388 388 tristate "Backlight driver for TI LP855X" 389 - depends on BACKLIGHT_CLASS_DEVICE && I2C 389 + depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM 390 390 help 391 391 This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and 392 392 LP8557 backlight driver. 393 393 394 394 config BACKLIGHT_LP8788 395 395 tristate "Backlight driver for TI LP8788 MFD" 396 - depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788 396 + depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788 && PWM 397 397 help 398 398 This supports TI LP8788 backlight driver. 399 399
+2 -1
drivers/video/backlight/gpio_backlight.c
··· 38 38 bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) 39 39 brightness = 0; 40 40 41 - gpio_set_value(gbl->gpio, brightness ? gbl->active : !gbl->active); 41 + gpio_set_value_cansleep(gbl->gpio, 42 + brightness ? gbl->active : !gbl->active); 42 43 43 44 return 0; 44 45 }
+1 -1
drivers/video/backlight/s6e63m0.c
··· 703 703 struct s6e63m0 *lcd = dev_get_drvdata(dev); 704 704 char temp[3]; 705 705 706 - sprintf(temp, "%d\n", lcd->gamma_table_count); 706 + sprintf(temp, "%u\n", lcd->gamma_table_count); 707 707 strcpy(buf, temp); 708 708 709 709 return strlen(buf);