portugalfuturista/openwrt-pf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

bcm47xx: refresh 6.18 patches

Browse source 
- Manually rebase 830-huawei_e970_support.patch
- Update .remove_new to .remove in 831-old_gpio_wdt.patch, see
commit e70140ba0d2b1a30467d4af6bcfe761327b9ec95
- make target/linux/refresh the rest

Signed-off-by: Kyle Hendry <kylehendrydev@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/24358
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
This commit is contained in:
Kyle Hendry 2026-05-06 21:27:15 -07:00 committed by Jonas Jelonek
parent 6fc18a3c3d
commit 0622567492
No known key found for this signature in database
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/bcm47xx/patches-6.18/830-huawei_e970_support.patch
View file

@ -8,7 +8,7 @@
#include <asm/bootinfo.h>
#include <asm/idle.h>
#include <asm/prom.h>
@@ -262,6 +263,33 @@ static struct fixed_phy_status bcm47xx_f
@@ -262,6 +263,33 @@ static const struct fixed_phy_status bcm
.duplex = DUPLEX_FULL,
};
@ -45,7 +45,7 @@
@@ -283,6 +311,7 @@ static int __init bcm47xx_register_bus_c
bcm47xx_workarounds();
fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
fixed_phy_add(&bcm47xx_fixed_phy_status);
+ bcm47xx_register_gpio_watchdog();
return 0;
}

6
target/linux/bcm47xx/patches-6.18/831-old_gpio_wdt.patch
View file

@ -4,7 +4,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1803,6 +1803,15 @@ config WDT_MTX1
@@ -1858,6 +1858,15 @@ config WDT_MTX1
Hardware driver for the MTX-1 boards. This is a watchdog timer that
will reboot the machine after a 100 seconds timer expired.
@ -22,7 +22,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
depends on CPU_SB1
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -169,6 +169,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
@@ -173,6 +173,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
@ -290,7 +290,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+
+static struct platform_driver gpio_wdt_driver = {
+ .probe = gpio_wdt_probe,
+ .remove_new = gpio_wdt_remove,
+ .remove = gpio_wdt_remove,
+ .driver.name = "gpio-wdt",
+};
+

8
target/linux/bcm47xx/patches-6.18/940-bcm47xx-yenta.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -925,6 +925,8 @@ static struct cardbus_type cardbus_type[
@@ -926,6 +926,8 @@ static struct cardbus_type cardbus_type[
static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mask)
{
@ -9,7 +9,7 @@
int i;
unsigned long val;
u32 mask;
@@ -953,6 +955,9 @@ static unsigned int yenta_probe_irq(stru
@@ -954,6 +956,9 @@ static unsigned int yenta_probe_irq(stru
mask = probe_irq_mask(val) & 0xffff;
return mask;
@ -19,7 +19,7 @@
}
@@ -1033,6 +1038,10 @@ static void yenta_get_socket_capabilitie
@@ -1034,6 +1039,10 @@ static void yenta_get_socket_capabilitie
else
socket->socket.irq_mask = 0;
@ -30,7 +30,7 @@
dev_info(&socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n",
socket->socket.irq_mask, socket->cb_irq);
}
@@ -1264,6 +1273,15 @@ static int yenta_probe(struct pci_dev *d
@@ -1265,6 +1274,15 @@ static int yenta_probe(struct pci_dev *d
dev_info(&dev->dev, "Socket status: %08x\n",
cb_readl(socket, CB_SOCKET_STATE));