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

Commit 670c039d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull backlight updates from Lee Jones:
 - Stop using LP855X Platform Data to control regulators
 - Move PWM8941 WLED driver into Backlight
 - Remove invalid use of IS_ERR_VALUE() macro
 - Remove duplicate check for NULL data before unregistering
 - Export I2C Device ID structure

* tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: tosa: Export I2C module alias information
  backlight: lp8788_bl: Delete a check before backlight_device_unregister()
  backlight: sky81452: Remove unneeded use of IS_ERR_VALUE() macro
  backlight: pm8941-wled: Move PM8941 WLED driver to backlight
  backlight: lp855x: Use private data for regulator control
parents 8bd8fd0a 13d20b3b

Documentation/devicetree/bindings/leds/leds-pm8941-wled.txt→Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt

+1 −4
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ Required properties: 
- reg: slave address



Optional properties:

- label: The label for this led

  See Documentation/devicetree/bindings/leds/common.txt

- linux,default-trigger: Default trigger assigned to the LED

  See Documentation/devicetree/bindings/leds/common.txt

- label: The name of the backlight device

- qcom,cs-out: bool; enable current sink output

- qcom,cabc: bool; enable content adaptive backlight control

- qcom,ext-gen: bool; use externally generated modulator signal to dim

drivers/leds/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -594,14 +594,6 @@ config LEDS_VERSATILE 
	  This option enabled support for the LEDs on the ARM Versatile

	  and RealView boards. Say Y to enabled these.



config LEDS_PM8941_WLED

	tristate "LED support for the Qualcomm PM8941 WLED block"

	depends on LEDS_CLASS

	select REGMAP

	help

	  This option enables support for the 'White' LED block

	  on Qualcomm PM8941 PMICs.



comment "LED Triggers"

source "drivers/leds/trigger/Kconfig"

drivers/leds/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ obj-$(CONFIG_LEDS_BLINKM) += leds-blinkm.o 
obj-$(CONFIG_LEDS_SYSCON)		+= leds-syscon.o

obj-$(CONFIG_LEDS_VERSATILE)		+= leds-versatile.o

obj-$(CONFIG_LEDS_MENF21BMC)		+= leds-menf21bmc.o

obj-$(CONFIG_LEDS_PM8941_WLED)		+= leds-pm8941-wled.o

obj-$(CONFIG_LEDS_KTD2692)		+= leds-ktd2692.o

obj-$(CONFIG_LEDS_POWERNV)		+= leds-powernv.o

drivers/video/backlight/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -299,6 +299,13 @@ config BACKLIGHT_TOSA 
	  If you have an Sharp SL-6000 Zaurus say Y to enable a driver

	  for its backlight



config BACKLIGHT_PM8941_WLED

	tristate "Qualcomm PM8941 WLED Driver"

	select REGMAP

	help

	  If you have the Qualcomm PM8941, say Y to enable a driver for the

	  WLED block.



config BACKLIGHT_SAHARA

	tristate "Tabletkiosk Sahara Touch-iT Backlight Driver"

	depends on X86

drivers/video/backlight/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o 
obj-$(CONFIG_BACKLIGHT_OT200)		+= ot200_bl.o

obj-$(CONFIG_BACKLIGHT_PANDORA)		+= pandora_bl.o

obj-$(CONFIG_BACKLIGHT_PCF50633)	+= pcf50633-backlight.o

obj-$(CONFIG_BACKLIGHT_PM8941_WLED)	+= pm8941-wled.o

obj-$(CONFIG_BACKLIGHT_PWM)		+= pwm_bl.o

obj-$(CONFIG_BACKLIGHT_SAHARA)		+= kb3886_bl.o

obj-$(CONFIG_BACKLIGHT_SKY81452)	+= sky81452-backlight.o