From 062256749205d0a65829ae5370a5c79f4c24be92 Mon Sep 17 00:00:00 2001 From: Kyle Hendry Date: Wed, 6 May 2026 21:27:15 -0700 Subject: [PATCH] bcm47xx: refresh 6.18 patches - 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 Link: https://github.com/openwrt/openwrt/pull/24358 Signed-off-by: Jonas Jelonek --- .../bcm47xx/patches-6.18/830-huawei_e970_support.patch | 4 ++-- target/linux/bcm47xx/patches-6.18/831-old_gpio_wdt.patch | 6 +++--- target/linux/bcm47xx/patches-6.18/940-bcm47xx-yenta.patch | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/linux/bcm47xx/patches-6.18/830-huawei_e970_support.patch b/target/linux/bcm47xx/patches-6.18/830-huawei_e970_support.patch index 08813da1ba3..1095112cef0 100644 --- a/target/linux/bcm47xx/patches-6.18/830-huawei_e970_support.patch +++ b/target/linux/bcm47xx/patches-6.18/830-huawei_e970_support.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -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; } diff --git a/target/linux/bcm47xx/patches-6.18/831-old_gpio_wdt.patch b/target/linux/bcm47xx/patches-6.18/831-old_gpio_wdt.patch index 0114ed87002..69fe4da9d8d 100644 --- a/target/linux/bcm47xx/patches-6.18/831-old_gpio_wdt.patch +++ b/target/linux/bcm47xx/patches-6.18/831-old_gpio_wdt.patch @@ -4,7 +4,7 @@ Signed-off-by: Mathias Adam --- 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 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 + +static struct platform_driver gpio_wdt_driver = { + .probe = gpio_wdt_probe, -+ .remove_new = gpio_wdt_remove, ++ .remove = gpio_wdt_remove, + .driver.name = "gpio-wdt", +}; + diff --git a/target/linux/bcm47xx/patches-6.18/940-bcm47xx-yenta.patch b/target/linux/bcm47xx/patches-6.18/940-bcm47xx-yenta.patch index f1b46c2ce4a..d06e9c5a9f8 100644 --- a/target/linux/bcm47xx/patches-6.18/940-bcm47xx-yenta.patch +++ b/target/linux/bcm47xx/patches-6.18/940-bcm47xx-yenta.patch @@ -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)); -- 2.47.3