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

Commit 7ddbc242 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Lee Jones
Browse files

backlight: pm8941-wled: Move PM8941 WLED driver to backlight 



The Qualcomm PM8941 WLED block is used for backlight and should therefor
be in the backlight framework and not in the LED framework. This moves
the driver and adapts to the backlight api instead.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Tested-by: default avatarRob Clark <robdclark@gmail.com>
Acked-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent fe009175

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
@@ -578,14 +578,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



# LED SPI Drivers

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