Skip to content

Commit 3f2dcb6

Browse files
committed
Merge tag 'backlight-next-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones: "Old Drivers - Remove driver for S6E63M0 - Remove driver for LD9040 Fix-ups - Trivial (email address update); adp*_bl - Use 'atomic' PWM API; pwm_bl Bug Fixes - Remove pointless boolen '&ptr' check; lm3639_bl" * tag 'backlight-next-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: backlight: Remove ld9040 driver backlight: Remove s6e63m0 driver backlight: lm3639: Unconditionally call led_classdev_unregister backlight: pwm_bl: Switch to using "atomic" PWM API backlight: Update MODULE AUTHOR email address
2 parents 3ea172c + e1c9f2e commit 3f2dcb6

File tree

12 files changed

+47
-2227
lines changed

12 files changed

+47
-2227
lines changed

Documentation/ABI/testing/sysfs-class-lcd-s6e63m0

Lines changed: 0 additions & 27 deletions
This file was deleted.

drivers/video/backlight/Kconfig

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,6 @@ config LCD_HP700
111111
If you have an HP Jornada 700 series handheld (710/720/728)
112112
say Y to enable LCD control driver.
113113

114-
config LCD_S6E63M0
115-
tristate "S6E63M0 AMOLED LCD Driver"
116-
depends on SPI && BACKLIGHT_CLASS_DEVICE
117-
default n
118-
help
119-
If you have an S6E63M0 LCD Panel, say Y to enable its
120-
LCD control driver.
121-
122-
config LCD_LD9040
123-
tristate "LD9040 AMOLED LCD Driver"
124-
depends on SPI && BACKLIGHT_CLASS_DEVICE
125-
default n
126-
help
127-
If you have an LD9040 Panel, say Y to enable its
128-
control driver.
129-
130114
config LCD_AMS369FG06
131115
tristate "AMS369FG06 AMOLED LCD Driver"
132116
depends on SPI && BACKLIGHT_CLASS_DEVICE

drivers/video/backlight/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ obj-$(CONFIG_LCD_HX8357) += hx8357.o
99
obj-$(CONFIG_LCD_ILI922X) += ili922x.o
1010
obj-$(CONFIG_LCD_ILI9320) += ili9320.o
1111
obj-$(CONFIG_LCD_L4F00242T03) += l4f00242t03.o
12-
obj-$(CONFIG_LCD_LD9040) += ld9040.o
1312
obj-$(CONFIG_LCD_LMS283GF05) += lms283gf05.o
1413
obj-$(CONFIG_LCD_LMS501KF03) += lms501kf03.o
1514
obj-$(CONFIG_LCD_LTV350QV) += ltv350qv.o
1615
obj-$(CONFIG_LCD_OTM3225A) += otm3225a.o
1716
obj-$(CONFIG_LCD_PLATFORM) += platform_lcd.o
18-
obj-$(CONFIG_LCD_S6E63M0) += s6e63m0.o
1917
obj-$(CONFIG_LCD_TDO24M) += tdo24m.o
2018
obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o
2119
obj-$(CONFIG_LCD_VGG2432A4) += vgg2432a4.o

drivers/video/backlight/adp5520_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static struct platform_driver adp5520_bl_driver = {
391391

392392
module_platform_driver(adp5520_bl_driver);
393393

394-
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
394+
MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");
395395
MODULE_DESCRIPTION("ADP5520(01) Backlight Driver");
396396
MODULE_LICENSE("GPL");
397397
MODULE_ALIAS("platform:adp5520-backlight");

drivers/video/backlight/adp8860_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,5 +822,5 @@ static struct i2c_driver adp8860_driver = {
822822
module_i2c_driver(adp8860_driver);
823823

824824
MODULE_LICENSE("GPL v2");
825-
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
825+
MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");
826826
MODULE_DESCRIPTION("ADP8860 Backlight driver");

drivers/video/backlight/adp8870_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,5 +992,5 @@ static struct i2c_driver adp8870_driver = {
992992
module_i2c_driver(adp8870_driver);
993993

994994
MODULE_LICENSE("GPL v2");
995-
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
995+
MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");
996996
MODULE_DESCRIPTION("ADP8870 Backlight driver");

0 commit comments

Comments
 (0)