leds: as3645a: 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.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/MAINTAINERS b/MAINTAINERS
index a61f4f3b78a91f13e25826d1b407e9ccbbb48cf8..7169a6bb8d91d27b7c741574409812cb428cb630 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2841,7 +2841,7 @@ AS3645A LED FLASH CONTROLLER DRIVER
 M:     Sakari Ailus <sakari.ailus@iki.fi>
 L:     linux-leds@vger.kernel.org
 S:     Maintained
-F:     drivers/leds/leds-as3645a.c
+F:     drivers/leds/flash/leds-as3645a.c
 
 ASAHI KASEI AK7375 LENS VOICE COIL DRIVER
 M:     Tianshu Qiu <tian.shu.qiu@intel.com>

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index a350d8fbb08532cf399de02130a1781817433eca..cfa6b8194b6be85e3c2200c348110d88e0c37a3a 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -94,15 +94,6 @@ config LEDS_ARIEL
 
          Say Y to if your machine is a Dell Wyse 3020 thin client.
 
-config LEDS_AS3645A
-       tristate "AS3645A and LM3555 LED flash controllers support"
-       depends on I2C && LEDS_CLASS_FLASH
-       depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS
-       help
-         Enable LED flash class support for AS3645A LED flash
-         controller. V4L2 flash API is provided as well if
-         CONFIG_V4L2_FLASH_API is enabled.
-
 config LEDS_AW2013
        tristate "LED support for Awinic AW2013"
        depends on LEDS_CLASS && I2C && OF

diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index c7231975837ad83f5bfe8335809d8e27a710ce2a..a3a6fda8ab992c214e47e7562d00a9c53590da3c 100644 (file)
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_LEDS_ADP5520)            += leds-adp5520.o
 obj-$(CONFIG_LEDS_AN30259A)            += leds-an30259a.o
 obj-$(CONFIG_LEDS_APU)                 += leds-apu.o
 obj-$(CONFIG_LEDS_ARIEL)               += leds-ariel.o
-obj-$(CONFIG_LEDS_AS3645A)             += leds-as3645a.o
 obj-$(CONFIG_LEDS_ASIC3)               += leds-asic3.o
 obj-$(CONFIG_LEDS_AW2013)              += leds-aw2013.o
 obj-$(CONFIG_LEDS_BCM6328)             += leds-bcm6328.o

diff --git a/drivers/leds/flash/Kconfig b/drivers/leds/flash/Kconfig
index 736153b0bfd67beb8483f82de213054e55e7fb9f..1126ad3954b624f5aeeba6898ef5eb806b4a6d97 100644 (file)
--- a/drivers/leds/flash/Kconfig
+++ b/drivers/leds/flash/Kconfig
@@ -11,6 +11,15 @@ config LEDS_AAT1290
        help
          This option enables support for the LEDs on the AAT1290.
 
+config LEDS_AS3645A
+       tristate "AS3645A and LM3555 LED flash controllers support"
+       depends on I2C
+       depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS
+       help
+         Enable LED flash class support for AS3645A LED flash
+         controller. V4L2 flash API is provided as well if
+         CONFIG_V4L2_FLASH_API is enabled.
+
 config LEDS_RT4505
        tristate "LED support for RT4505 flashlight controller"
        depends on I2C && OF

diff --git a/drivers/leds/flash/Makefile b/drivers/leds/flash/Makefile
index 11bec5881d51dc6de2ffeac456a62fdf1da68f57..9bb2fccee047a04799ba56f8255308abad046d4e 100644 (file)
--- a/drivers/leds/flash/Makefile
+++ b/drivers/leds/flash/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_LEDS_AAT1290)     += leds-aat1290.o
+obj-$(CONFIG_LEDS_AS3645A)     += leds-as3645a.o
 obj-$(CONFIG_LEDS_RT4505)      += leds-rt4505.o
 obj-$(CONFIG_LEDS_RT8515)      += leds-rt8515.o

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