leds: lm3601x: Move driver to flash subdirectory

We created a subdirectory for LED drivers that depend on
CONFIG_LEDS_CLASS_FLASH, and this driver does so let's
move it there.

Cc: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 171ccfd4de1b4cdbb9156eda3ed8709f3c5720d5..1671aa2f90b53cb3adc38879a507cf17aedd178e 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -220,15 +220,6 @@ config LEDS_LM3692X
          This option enables support for the TI LM3692x family
          of white LED string drivers used for backlighting.
 
-config LEDS_LM3601X
-       tristate "LED support for LM3601x Chips"
-       depends on LEDS_CLASS && I2C
-       depends on LEDS_CLASS_FLASH
-       select REGMAP_I2C
-       help
-         This option enables support for the TI LM3601x family
-         of flash, torch and indicator classes.
-
 config LEDS_LOCOMO
        tristate "LED Support for Locomo device"
        depends on LEDS_CLASS

diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 5e804f72b8e5509a9752c6ee4c0397f5df469e5d..6d5c23afaf98d8f85448d829f36530e05a10f465 100644 (file)
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_LEDS_LM3530)             += leds-lm3530.o
 obj-$(CONFIG_LEDS_LM3532)              += leds-lm3532.o
 obj-$(CONFIG_LEDS_LM3533)              += leds-lm3533.o
 obj-$(CONFIG_LEDS_LM355x)              += leds-lm355x.o
-obj-$(CONFIG_LEDS_LM3601X)             += leds-lm3601x.o
 obj-$(CONFIG_LEDS_LM36274)             += leds-lm36274.o
 obj-$(CONFIG_LEDS_LM3642)              += leds-lm3642.o
 obj-$(CONFIG_LEDS_LM3692X)             += leds-lm3692x.o

diff --git a/drivers/leds/flash/Kconfig b/drivers/leds/flash/Kconfig
index 788d698587a7f56bd417ba445bdf8ce37a639435..6cb6600555f07b9249c4a9875d4d607b7955e7e4 100644 (file)
--- a/drivers/leds/flash/Kconfig
+++ b/drivers/leds/flash/Kconfig
@@ -20,6 +20,14 @@ config LEDS_AS3645A
          controller. V4L2 flash API is provided as well if
          CONFIG_V4L2_FLASH_API is enabled.
 
+config LEDS_LM3601X
+       tristate "LED support for LM3601x Chips"
+       depends on LEDS_CLASS && I2C
+       select REGMAP_I2C
+       help
+         This option enables support for the TI LM3601x family
+         of flash, torch and indicator classes.
+
 config LEDS_MAX77693
        tristate "LED support for MAX77693 Flash"
        depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS

diff --git a/drivers/leds/flash/Makefile b/drivers/leds/flash/Makefile
index 2f9153e787175604eed6da2b1f7750c3f5b3f32f..67556329441e42662672cdc4e46a0aea1bd7bdd4 100644 (file)
--- a/drivers/leds/flash/Makefile
+++ b/drivers/leds/flash/Makefile
@@ -2,6 +2,7 @@
 
 obj-$(CONFIG_LEDS_AAT1290)     += leds-aat1290.o
 obj-$(CONFIG_LEDS_AS3645A)     += leds-as3645a.o
+obj-$(CONFIG_LEDS_LM3601X)     += leds-lm3601x.o
 obj-$(CONFIG_LEDS_MAX77693)    += leds-max77693.o
 obj-$(CONFIG_LEDS_RT4505)      += leds-rt4505.o
 obj-$(CONFIG_LEDS_RT8515)      += leds-rt8515.o

diff --git a/drivers/leds/leds-lm3601x.c b/drivers/leds/flash/leds-lm3601x.c
similarity index 100%
rename from drivers/leds/leds-lm3601x.c
rename to drivers/leds/flash/leds-lm3601x.c