leds: Move pwm-multicolor driver into rgb directory

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@disruptive-technologies.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ea4481000bfe3df8a4950879f172dd0c45ce71ea..a49979f41eee76967c1abb008e51f1209f64e3ed 100644 (file)
--- 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 c6a147865705c4d9e2da9c5f82787872e6b8b20b..4fd2f92cd19811c29c84ce395237fa0e8c9b59c8 100644 (file)
--- 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 5dd27ad808562f917fbd61fd17c36b2648506e63..63fd40b257ec50f52eff52633af899a078a56213 100644 (file)
--- 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 83114f44c4eaec404f74e0239a759555385e0f7d..0675bc0f6e18f87f5022ac245cb0b7769d5037b9 100644 (file)
--- 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