From: Sven Schwermer <sven.schwermer@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
The drivers/leds/rgb subdirectory is relatively fresh, so we move this
new PWM multi-color driver into it.
Signed-off-by: Sven Schwermer <sven.schwermer@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
drivers/leds/Kconfig | 11 -----------
drivers/leds/Makefile | 1 -
drivers/leds/rgb/Kconfig | 10 ++++++++++
drivers/leds/rgb/Makefile | 3 ++-
drivers/leds/{ => rgb}/leds-pwm-multicolor.c | 0
5 files changed, 12 insertions(+), 13 deletions(-)
rename drivers/leds/{ => rgb}/leds-pwm-multicolor.c (100%)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ea4481000bfe..a49979f41eee 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -552,17 +552,6 @@ config LEDS_PWM
help
This option enables support for pwm driven LEDs
-config LEDS_PWM_MULTICOLOR
- tristate "PWM driven multi-color LED Support"
- depends on LEDS_CLASS_MULTICOLOR
- depends on PWM
- help
- This option enables support for PWM driven monochrome LEDs that are
- grouped into multicolor LEDs.
-
- To compile this driver as a module, choose M here: the module
- will be called leds-pwm-multicolor.
-
config LEDS_REGULATOR
tristate "REGULATOR driven LED support"
depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index c6a147865705..4fd2f92cd198 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -73,7 +73,6 @@ obj-$(CONFIG_LEDS_PCA963X) += leds-pca963x.o
obj-$(CONFIG_LEDS_PM8058) += leds-pm8058.o
obj-$(CONFIG_LEDS_POWERNV) += leds-powernv.o
obj-$(CONFIG_LEDS_PWM) += leds-pwm.o
-obj-$(CONFIG_LEDS_PWM_MULTICOLOR) += leds-pwm-multicolor.o
obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o
obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o
obj-$(CONFIG_LEDS_SC27XX_BLTC) += leds-sc27xx-bltc.o
diff --git a/drivers/leds/rgb/Kconfig b/drivers/leds/rgb/Kconfig
index 5dd27ad80856..63fd40b257ec 100644
--- a/drivers/leds/rgb/Kconfig
+++ b/drivers/leds/rgb/Kconfig
@@ -2,6 +2,16 @@
if LEDS_CLASS_MULTICOLOR
+config LEDS_PWM_MULTICOLOR
+ tristate "PWM driven multi-color LED Support"
+ depends on PWM
+ help
+ This option enables support for PWM driven monochrome LEDs that are
+ grouped into multicolor LEDs.
+
+ To compile this driver as a module, choose M here: the module
+ will be called leds-pwm-multicolor.
+
config LEDS_QCOM_LPG
tristate "LED support for Qualcomm LPG"
depends on OF
diff --git a/drivers/leds/rgb/Makefile b/drivers/leds/rgb/Makefile
index 83114f44c4ea..0675bc0f6e18 100644
--- a/drivers/leds/rgb/Makefile
+++ b/drivers/leds/rgb/Makefile
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_LEDS_QCOM_LPG) += leds-qcom-lpg.o
+obj-$(CONFIG_LEDS_PWM_MULTICOLOR) += leds-pwm-multicolor.o
+obj-$(CONFIG_LEDS_QCOM_LPG) += leds-qcom-lpg.o
diff --git a/drivers/leds/leds-pwm-multicolor.c b/drivers/leds/rgb/leds-pwm-multicolor.c
similarity index 100%
rename from drivers/leds/leds-pwm-multicolor.c
rename to drivers/leds/rgb/leds-pwm-multicolor.c
--
2.36.0
