diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2021-05-28 22:24:01 +0200 |
|---|---|---|
| committer |   Pavel Machek <pavel@ucw.cz> | 2021-07-12 10:30:05 +0200 |
| commit | eb5a4422e448a8200ddaafef0cc16db3f45ec1f8 (patch) | |
| tree | b91d1fbc27d1ed79a14ea4e1bead7e14fa1d6e53 | |
| parent | leds: as3645a: Move driver to flash subdirectory (diff) | |
| download | linux-dev-eb5a4422e448a8200ddaafef0cc16db3f45ec1f8.tar.xz linux-dev-eb5a4422e448a8200ddaafef0cc16db3f45ec1f8.zip | |
leds: max77693: 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: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
| -rw-r--r-- | drivers/leds/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/leds/Makefile | 1 | ||||
| -rw-r--r-- | drivers/leds/flash/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/leds/flash/Makefile | 1 | ||||
| -rw-r--r-- | drivers/leds/flash/leds-max77693.c (renamed from drivers/leds/leds-max77693.c) | 0 |
5 files changed, 11 insertions, 12 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index cfa6b8194b6b..723de0d30039 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -680,17 +680,6 @@ config LEDS_MAX77650 help LEDs driver for MAX77650 family of PMICs from Maxim Integrated. -config LEDS_MAX77693 - tristate "LED support for MAX77693 Flash" - depends on LEDS_CLASS_FLASH - depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS - depends on MFD_MAX77693 - depends on OF - help - This option enables support for the flash part of the MAX77693 - multifunction device. It has build in control for two leds in flash - and torch mode. - config LEDS_MAX8997 tristate "LED support for MAX8997 PMIC" depends on LEDS_CLASS && MFD_MAX8997 diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index a3a6fda8ab99..6f4aa0e6e355 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -58,7 +58,6 @@ obj-$(CONFIG_LEDS_LP8788) += leds-lp8788.o obj-$(CONFIG_LEDS_LP8860) += leds-lp8860.o obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o obj-$(CONFIG_LEDS_MAX77650) += leds-max77650.o -obj-$(CONFIG_LEDS_MAX77693) += leds-max77693.o obj-$(CONFIG_LEDS_MAX8997) += leds-max8997.o obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o obj-$(CONFIG_LEDS_MENF21BMC) += leds-menf21bmc.o diff --git a/drivers/leds/flash/Kconfig b/drivers/leds/flash/Kconfig index 1126ad3954b6..6401af23947f 100644 --- a/drivers/leds/flash/Kconfig +++ b/drivers/leds/flash/Kconfig @@ -20,6 +20,16 @@ config LEDS_AS3645A controller. V4L2 flash API is provided as well if CONFIG_V4L2_FLASH_API is enabled. +config LEDS_MAX77693 + tristate "LED support for MAX77693 Flash" + depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS + depends on MFD_MAX77693 + depends on OF + help + This option enables support for the flash part of the MAX77693 + multifunction device. It has build in control for two leds in flash + and torch mode. + 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 9bb2fccee047..c2a5e530261d 100644 --- a/drivers/leds/flash/Makefile +++ b/drivers/leds/flash/Makefile @@ -2,5 +2,6 @@ obj-$(CONFIG_LEDS_AAT1290) += leds-aat1290.o obj-$(CONFIG_LEDS_AS3645A) += leds-as3645a.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-max77693.c b/drivers/leds/flash/leds-max77693.c index 5c1faeb55a31..5c1faeb55a31 100644 --- a/drivers/leds/leds-max77693.c +++ b/drivers/leds/flash/leds-max77693.c |