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

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/mfd/ti-lmu.c b/drivers/mfd/ti-lmu.c
index b06cb908d1aa..691ab9dd6236 100644
--- a/drivers/mfd/ti-lmu.c
+++ b/drivers/mfd/ti-lmu.c
@@ -111,17 +111,14 @@ static const struct mfd_cell lm3695_devices[] = {
         },
 };
 
-static const struct mfd_cell lm3697_devices[] = {
+static const struct mfd_cell lm36274_devices[] = {
+        LM363X_REGULATOR(LM36274_BOOST),
+        LM363X_REGULATOR(LM36274_LDO_POS),
+        LM363X_REGULATOR(LM36274_LDO_NEG),
         {
-                .name          = "ti-lmu-backlight",
-                .id            = LM3697,
-                .of_compatible = "ti,lm3697-backlight",
-        },
-        /* Monitoring driver for open/short circuit detection */
-        {
-                .name          = "ti-lmu-fault-monitor",
-                .id            = LM3697,
-                .of_compatible = "ti,lm3697-fault-monitor",
+                .name          = "lm36274-leds",
+                .id            = LM36274,
+                .of_compatible = "ti,lm36274-backlight",
         },
 };
 
@@ -137,7 +134,7 @@ TI_LMU_DATA(lm3631, LM3631_MAX_REG);
 TI_LMU_DATA(lm3632, LM3632_MAX_REG);
 TI_LMU_DATA(lm3633, LM3633_MAX_REG);
 TI_LMU_DATA(lm3695, LM3695_MAX_REG);
-TI_LMU_DATA(lm3697, LM3697_MAX_REG);
+TI_LMU_DATA(lm36274, LM36274_MAX_REG);
 
 static int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 {
@@ -206,7 +203,7 @@ static const struct of_device_id ti_lmu_of_match[] = {
         { .compatible = "ti,lm3632", .data = &lm3632_data },
         { .compatible = "ti,lm3633", .data = &lm3633_data },
         { .compatible = "ti,lm3695", .data = &lm3695_data },
-        { .compatible = "ti,lm3697", .data = &lm3697_data },
+        { .compatible = "ti,lm36274", .data = &lm36274_data },
         { }
 };
 MODULE_DEVICE_TABLE(of, ti_lmu_of_match);
@@ -216,7 +213,7 @@ static const struct i2c_device_id ti_lmu_ids[] = {
         { "lm3632", LM3632 },
         { "lm3633", LM3633 },
         { "lm3695", LM3695 },
-        { "lm3697", LM3697 },
+        { "lm36274", LM36274 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, ti_lmu_ids);