From: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Date: Tue, 11 Jun 2019 21:46:37 +0000 (+0200)
Subject: Merge tag 'ti-lmu-led-drivers' into for-next
X-Git-Tag: microblaze-v5.4-rc1~385^2~2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=25529edef561ca51dadcbb6e97b1c40d2dbc5bae;p=linux-2.6-microblaze.git

Merge tag 'ti-lmu-led-drivers' into for-next

Merge immutable branch between LEDs, MFD and REGULATOR due to
TI LMU LED support rework and introduction of two new drivers
with DT bindings.

* tag 'ti-lmu-led-drivers':
  leds: lm36274: Introduce the TI LM36274 LED driver
  dt-bindings: leds: Add LED bindings for the LM36274
  regulator: lm363x: Add support for LM36274
  mfd: ti-lmu: Add LM36274 support to the ti-lmu
  dt-bindings: mfd: Add lm36274 bindings to ti-lmu
  leds: lm3697: Introduce the lm3697 driver
  mfd: ti-lmu: Remove support for LM3697
  dt-bindings: ti-lmu: Modify dt bindings for the LM3697
  leds: TI LMU: Add common code for TI LMU devices
  dt-bindings: mfd: LMU: Add ti,brightness-resolution
  dt-bindings: mfd: LMU: Add the ramp up/down property
---

25529edef561ca51dadcbb6e97b1c40d2dbc5bae
diff --cc drivers/leds/Kconfig
index 35fcddb7ac2a,c36cbabdd9c6..fb8072303ee8
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -783,16 -783,31 +783,41 @@@ config LEDS_NIC78B
  	  To compile this driver as a module, choose M here: the module
  	  will be called leds-nic78bx.
  
 +config LEDS_SPI_BYTE
 +	tristate "LED support for SPI LED controller with a single byte"
 +	depends on LEDS_CLASS
 +	depends on SPI
 +	depends on OF
 +	help
 +	  This option enables support for LED controller which use a single byte
 +	  for controlling the brightness. Currently the following controller is
 +	  supported: Ubiquiti airCube ISP microcontroller based LED controller.
 +
+ config LEDS_TI_LMU_COMMON
+ 	tristate "LED driver for TI LMU"
+ 	depends on LEDS_CLASS
+ 	depends on REGMAP
+ 	help
+ 	  Say Y to enable the LED driver for TI LMU devices.
+ 	  This supports common features between the TI LM3532, LM3631, LM3632,
+ 	  LM3633, LM3695 and LM3697.
+ 
+ config LEDS_LM3697
+ 	tristate "LED driver for LM3697"
+ 	depends on LEDS_TI_LMU_COMMON
+ 	depends on I2C && OF
+ 	help
+ 	  Say Y to enable the LM3697 LED driver for TI LMU devices.
+ 	  This supports the LED device LM3697.
+ 
+ config LEDS_LM36274
+ 	tristate "LED driver for LM36274"
+ 	depends on LEDS_TI_LMU_COMMON
+ 	depends on MFD_TI_LMU
+ 	help
+ 	  Say Y to enable the LM36274 LED driver for TI LMU devices.
+ 	  This supports the LED device LM36274.
+ 
  comment "LED Triggers"
  source "drivers/leds/trigger/Kconfig"