domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath79: Make patches apply again

Browse Source 
The patch adding support for LEDs connected to a reset controller did
not apply any more, refresh it on top of current master.

Fixes: 53fc987b25 ("generic: move ledbar driver from mediatek target")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2022-09-11 22:17:47 +02:00
parent e22ca21daa
commit 76fc277917
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch
View File

@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -931,6 +931,17 @@ config LEDS_ACER_A500 @@ -941,6 +941,17 @@ config LEDS_UBNT_LEDBAR
To compile this driver as a module, choose M here: the module
source "drivers/leds/blink/Kconfig" will be called leds-ubnt-ledbar.
+config LEDS_RESET +config LEDS_RESET
+ tristate "LED support for reset-controller API" + tristate "LED support for reset-controller API"
@@ -176,10 +176,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
+MODULE_ALIAS("platform:leds-reset"); +MODULE_ALIAS("platform:leds-reset");
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -93,6 +93,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds @@ -94,6 +94,7 @@ obj-$(CONFIG_LEDS_WM831X_STATUS) += leds
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
obj-$(CONFIG_LEDS_UBNT_LEDBAR) += leds-ubnt-ledbar.o
+obj-$(CONFIG_LEDS_RESET) += leds-reset.o +obj-$(CONFIG_LEDS_RESET) += leds-reset.o
# LED SPI Drivers # LED SPI Drivers

10
target/linux/ath79/patches-5.15/0003-leds-add-reset-controller-based-driver.patch
View File

@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -876,6 +876,17 @@ source "drivers/leds/blink/Kconfig" @@ -886,6 +886,17 @@ config LEDS_UBNT_LEDBAR
comment "Flash and Torch LED drivers" To compile this driver as a module, choose M here: the module
source "drivers/leds/flash/Kconfig" will be called leds-ubnt-ledbar.
+config LEDS_RESET +config LEDS_RESET
+ tristate "LED support for reset-controller API" + tristate "LED support for reset-controller API"
@@ -176,10 +176,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
+MODULE_ALIAS("platform:leds-reset"); +MODULE_ALIAS("platform:leds-reset");
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds @@ -88,6 +88,7 @@ obj-$(CONFIG_LEDS_WM831X_STATUS) += leds
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
obj-$(CONFIG_LEDS_UBNT_LEDBAR) += leds-ubnt-ledbar.o
+obj-$(CONFIG_LEDS_RESET) += leds-reset.o +obj-$(CONFIG_LEDS_RESET) += leds-reset.o
# LED SPI Drivers # LED SPI Drivers

6
target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch
View File

@@ -1,8 +1,8 @@
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -929,6 +929,16 @@ config LEDS_ACER_A500 @@ -931,6 +931,16 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of
Acer Iconia Tab A500. source "drivers/leds/blink/Kconfig"
+config LEDS_UBNT_LEDBAR +config LEDS_UBNT_LEDBAR
+ tristate "LED support for Ubiquiti UniFi 6 LR" + tristate "LED support for Ubiquiti UniFi 6 LR"

2
target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch
View File

@@ -168,7 +168,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
@@ -790,6 +791,13 @@ static bool page_referenced_one(struct p @@ -793,6 +794,13 @@ static bool page_referenced_one(struct p
} }
if (pvmw.pte) { if (pvmw.pte) {

2
target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
View File

@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -7556,7 +7556,7 @@ static void __init alloc_node_mem_map(st @@ -7557,7 +7557,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) { if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map; mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn) if (page_to_pfn(mem_map) != pgdat->node_start_pfn)