From a28ccd58ed56e53726a2ca7844ab11d043ce973a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 18 Sep 2022 15:38:47 +0100 Subject: ath79: Make patches apply again 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 Signed-off-by: Daniel Golle (cherry picked from commit 76fc277917fc847892dbbf525aea9f90a035d296) --- ...0003-leds-add-reset-controller-based-driver.patch | 20 ++++++++++---------- .../generic/hack-5.10/800-ubnt-ledbar-driver.patch | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch index 4a721f2af2..c1fa96ab44 100644 --- a/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch +++ b/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch @@ -13,9 +13,9 @@ Signed-off-by: John Crispin --- 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 +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 diff --git a/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch b/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch index 92264eedf9..2b4baab456 100644 --- a/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch +++ b/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch @@ -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" -- cgit v1.2.3