Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f2dcb64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3ea172c8 e1c9f2ea

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

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
sysfs interface for the S6E63M0 AMOLED LCD panel driver

-------------------------------------------------------



What:		/sys/class/lcd/<lcd>/gamma_mode

Date:		May, 2010

KernelVersion:	v2.6.35

Contact:	dri-devel@lists.freedesktop.org

Description:

		(RW) Read or write the gamma mode. Following three modes are

		supported:

		0 - gamma value 2.2,

		1 - gamma value 1.9 and

		2 - gamma value 1.7.





What:		/sys/class/lcd/<lcd>/gamma_table

Date:		May, 2010

KernelVersion:	v2.6.35

Contact:	dri-devel@lists.freedesktop.org

Description:

		(RO) Displays the size of the gamma table i.e. the number of

		gamma modes available.



This is a backlight lcd driver. These interfaces are an extension to the API

documented in Documentation/ABI/testing/sysfs-class-lcd and in

Documentation/ABI/stable/sysfs-class-backlight (under

/sys/class/backlight/<backlight>/).

drivers/video/backlight/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -111,22 +111,6 @@ config LCD_HP700 
	  If you have an HP Jornada 700 series handheld (710/720/728)

	  say Y to enable LCD control driver.



config LCD_S6E63M0

	tristate "S6E63M0 AMOLED LCD Driver"

	depends on SPI && BACKLIGHT_CLASS_DEVICE

	default n

	help

	  If you have an S6E63M0 LCD Panel, say Y to enable its

	  LCD control driver.



config LCD_LD9040

	tristate "LD9040 AMOLED LCD Driver"

	depends on SPI && BACKLIGHT_CLASS_DEVICE

	default n

	help

	  If you have an LD9040 Panel, say Y to enable its

	  control driver.



config LCD_AMS369FG06

	tristate "AMS369FG06 AMOLED LCD Driver"

	depends on SPI && BACKLIGHT_CLASS_DEVICE

drivers/video/backlight/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -9,13 +9,11 @@ obj-$(CONFIG_LCD_HX8357) += hx8357.o 
obj-$(CONFIG_LCD_ILI922X)		+= ili922x.o

obj-$(CONFIG_LCD_ILI9320)		+= ili9320.o

obj-$(CONFIG_LCD_L4F00242T03)		+= l4f00242t03.o

obj-$(CONFIG_LCD_LD9040)		+= ld9040.o

obj-$(CONFIG_LCD_LMS283GF05)		+= lms283gf05.o

obj-$(CONFIG_LCD_LMS501KF03)		+= lms501kf03.o

obj-$(CONFIG_LCD_LTV350QV)		+= ltv350qv.o

obj-$(CONFIG_LCD_OTM3225A)		+= otm3225a.o

obj-$(CONFIG_LCD_PLATFORM)		+= platform_lcd.o

obj-$(CONFIG_LCD_S6E63M0)		+= s6e63m0.o

obj-$(CONFIG_LCD_TDO24M)		+= tdo24m.o

obj-$(CONFIG_LCD_TOSA)			+= tosa_lcd.o

obj-$(CONFIG_LCD_VGG2432A4)		+= vgg2432a4.o

drivers/video/backlight/adp5520_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static struct platform_driver adp5520_bl_driver = { 


module_platform_driver(adp5520_bl_driver);



MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");

MODULE_DESCRIPTION("ADP5520(01) Backlight Driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:adp5520-backlight");

drivers/video/backlight/adp8860_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -822,5 +822,5 @@ static struct i2c_driver adp8860_driver = { 
module_i2c_driver(adp8860_driver);



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_AUTHOR("Michael Hennerich <michael.hennerich@analog.com>");

MODULE_DESCRIPTION("ADP8860 Backlight driver");