lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-06-12 12:45:50 -07:00
parent bae14e7a2d ab1e59b4dc
commit af76004cf8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/backlight/Kconfig
View File

@@ -29,7 +29,7 @@ if LCD_CLASS_DEVICE
config LCD_CORGI config LCD_CORGI
tristate "LCD Panel support for SHARP corgi/spitz model" tristate "LCD Panel support for SHARP corgi/spitz model"
depends on SPI_MASTER && PXA_SHARPSL depends on SPI_MASTER && PXA_SHARPSL && BACKLIGHT_CLASS_DEVICE
help help
Say y here to support the LCD panels usually found on SHARP Say y here to support the LCD panels usually found on SHARP
corgi (C7x0) and spitz (Cxx00) models. corgi (C7x0) and spitz (Cxx00) models.
@@ -370,7 +370,7 @@ config BACKLIGHT_AAT2870
config BACKLIGHT_LM3630A config BACKLIGHT_LM3630A
tristate "Backlight Driver for LM3630A" tristate "Backlight Driver for LM3630A"
depends on BACKLIGHT_CLASS_DEVICE && I2C depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
select REGMAP_I2C select REGMAP_I2C
help help
This supports TI LM3630A Backlight Driver This supports TI LM3630A Backlight Driver
@@ -386,14 +386,14 @@ config BACKLIGHT_LM3639
config BACKLIGHT_LP855X config BACKLIGHT_LP855X
tristate "Backlight driver for TI LP855X" tristate "Backlight driver for TI LP855X"
depends on BACKLIGHT_CLASS_DEVICE && I2C depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
help help
This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and
LP8557 backlight driver. LP8557 backlight driver.
config BACKLIGHT_LP8788 config BACKLIGHT_LP8788
tristate "Backlight driver for TI LP8788 MFD" tristate "Backlight driver for TI LP8788 MFD"
depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788 depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788 && PWM
help help
This supports TI LP8788 backlight driver. This supports TI LP8788 backlight driver.

3
drivers/video/backlight/gpio_backlight.c
View File

@@ -38,7 +38,8 @@ static int gpio_backlight_update_status(struct backlight_device *bl)
bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
brightness = 0; brightness = 0;
gpio_set_value(gbl->gpio, brightness ? gbl->active : !gbl->active); gpio_set_value_cansleep(gbl->gpio,
brightness ? gbl->active : !gbl->active);
return 0; return 0;
} }

2
drivers/video/backlight/s6e63m0.c
View File

@@ -703,7 +703,7 @@ static ssize_t s6e63m0_sysfs_show_gamma_table(struct device *dev,
struct s6e63m0 *lcd = dev_get_drvdata(dev); struct s6e63m0 *lcd = dev_get_drvdata(dev);
char temp[3]; char temp[3];
sprintf(temp, "%d\n", lcd->gamma_table_count); sprintf(temp, "%u\n", lcd->gamma_table_count);
strcpy(buf, temp); strcpy(buf, temp);
return strlen(buf); return strlen(buf);