From: Linus Walleij <linus.walleij@linaro.org>
To: Pavel Machek <pavel@ucw.cz>
Cc: linux-leds@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>
Subject: [PATCH 3/6] leds: max77693: Move driver to flash subdirectory
Date: Fri, 28 May 2021 22:24:01 +0200 [thread overview]
Message-ID: <20210528202404.431859-3-linus.walleij@linaro.org> (raw)
In-Reply-To: <20210528202404.431859-1-linus.walleij@linaro.org>
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: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/leds/Kconfig | 11 -----------
drivers/leds/Makefile | 1 -
drivers/leds/flash/Kconfig | 10 ++++++++++
drivers/leds/flash/Makefile | 1 +
drivers/leds/{ => flash}/leds-max77693.c | 0
5 files changed, 11 insertions(+), 12 deletions(-)
rename drivers/leds/{ => flash}/leds-max77693.c (100%)
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
similarity index 100%
rename from drivers/leds/leds-max77693.c
rename to drivers/leds/flash/leds-max77693.c
--
2.31.1
next prev parent reply other threads:[~2021-05-28 20:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 20:23 [PATCH 1/6] leds: aat1290: Move driver to flash subdirectory Linus Walleij
2021-05-28 20:24 ` [PATCH 2/6] leds: as3645a: " Linus Walleij
2021-05-31 6:39 ` Sakari Ailus
2021-05-28 20:24 ` Linus Walleij [this message]
2021-05-28 20:24 ` [PATCH 4/6] leds: sgm3140: " Linus Walleij
2021-05-28 20:24 ` [PATCH 5/6] leds: lm3601x: " Linus Walleij
2021-05-28 20:24 ` [PATCH 6/6] leds: ktd2692: " Linus Walleij
2021-05-31 19:49 ` [PATCH 1/6] leds: aat1290: " Jacek Anaszewski
2021-07-03 20:15 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210528202404.431859-3-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).