ath79: Make patches apply again
authorDaniel Golle <daniel@makrotopia.org>
Sun, 18 Sep 2022 14:38:47 +0000 (15:38 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Sun, 18 Sep 2022 14:40:04 +0000 (15:40 +0100)
The patch adding support for LEDs connected to a reset controller did
not apply any more, refresh it on top of current master.

Fixes: 53fc987b2552 ("generic: move ledbar driver from mediatek target")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 76fc277917fc847892dbbf525aea9f90a035d296)

target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch
target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch

index 4a721f2af26a3661ec34ff5d8a3479889d0f5d98..c1fa96ab444d85a56ed79f4a90fa8deb841c448f 100644 (file)
@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -931,6 +931,17 @@ config LEDS_ACER_A500
- source "drivers/leds/blink/Kconfig"
+@@ -941,6 +941,17 @@ config LEDS_UBNT_LEDBAR
+         To compile this driver as a module, choose M here: the module
+         will be called leds-ubnt-ledbar.
  
 +config LEDS_RESET
 +      tristate "LED support for reset-controller API"
@@ -176,11 +176,11 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +MODULE_ALIAS("platform:leds-reset");
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -93,6 +93,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA)              += leds
- obj-$(CONFIG_LEDS_WM831X_STATUS)      += leds-wm831x-status.o
- obj-$(CONFIG_LEDS_WM8350)             += leds-wm8350.o
- obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
+@@ -80,6 +80,7 @@ obj-$(CONFIG_LEDS_PM8058)            += leds-pm805
+ obj-$(CONFIG_LEDS_POWERNV)            += leds-powernv.o
+ obj-$(CONFIG_LEDS_PWM)                        += leds-pwm.o
+ obj-$(CONFIG_LEDS_REGULATOR)          += leds-regulator.o
 +obj-$(CONFIG_LEDS_RESET)              += leds-reset.o
- # LED SPI Drivers
- obj-$(CONFIG_LEDS_CR0014114)          += leds-cr0014114.o
+ obj-$(CONFIG_LEDS_S3C24XX)            += leds-s3c24xx.o
+ obj-$(CONFIG_LEDS_SC27XX_BLTC)                += leds-sc27xx-bltc.o
+ obj-$(CONFIG_LEDS_SGM3140)            += leds-sgm3140.o
index 92264eedf9cc4b32ce2ffb480f2fa628761d2245..2b4baab456a0002ac9718fb0c9b5d4ca6ca3ac9d 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -929,6 +929,16 @@ config LEDS_ACER_A500
-         This option enables support for the Power Button LED of
-         Acer Iconia Tab A500.
+@@ -931,6 +931,16 @@ config LEDS_ACER_A500
+ source "drivers/leds/blink/Kconfig"
  
 +config LEDS_UBNT_LEDBAR
 +      tristate "LED support for Ubiquiti UniFi 6 LR"