From 547f8a86bb7832922ad57e831874676ea7fbe6ea Mon Sep 17 00:00:00 2001 From: Andrew LaMarche Date: Sun, 20 Sep 2026 20:53:48 +0000 Subject: [PATCH] bmips: refresh 6.18 patches Refresh patches for 6.18. Signed-off-by: Andrew LaMarche Link: https://github.com/openwrt/openwrt/pull/25293 Signed-off-by: Jonas Jelonek --- ...ort-for-bcm6345-style-external-inter.patch | 26 +++++++++---------- ...202-mips-bmips-tweak-Kconfig-options.patch | 8 +++--- ...net-mdio-mux-bcm6368-allow-disabling.patch | 2 +- .../600-mips-bmips-add-pci-support.patch | 2 +- ...controllers-add-bcm6328-pcie-support.patch | 2 +- ...controllers-add-bcm6318-pcie-support.patch | 2 +- ...-controllers-add-bcm6348-pci-support.patch | 2 +- ...rt-for-Sercomm-MSP430-LED-controller.patch | 6 ++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/target/linux/bmips/patches-6.18/100-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/bmips/patches-6.18/100-irqchip-add-support-for-bcm6345-style-external-inter.patch index 27d6b409bbd..643fd6ce636 100644 --- a/target/linux/bmips/patches-6.18/100-irqchip-add-support-for-bcm6345-style-external-inter.patch +++ b/target/linux/bmips/patches-6.18/100-irqchip-add-support-for-bcm6345-style-external-inter.patch @@ -50,9 +50,9 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -110,6 +110,10 @@ config I8259 - bool - select IRQ_DOMAIN +@@ -143,6 +143,10 @@ config BCM2712_MIP + + If unsure say n. +config BCM6345_EXT_IRQ + bool "BCM6345 External IRQ Controller" @@ -61,16 +61,6 @@ Signed-off-by: Jonas Gorski config BCM6345_L1_IRQ bool select GENERIC_IRQ_CHIP ---- a/drivers/irqchip/Makefile -+++ b/drivers/irqchip/Makefile -@@ -62,6 +62,7 @@ obj-$(CONFIG_XTENSA_MX) += irq-xtensa- - obj-$(CONFIG_XILINX_INTC) += irq-xilinx-intc.o - obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o - obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o -+obj-$(CONFIG_BCM6345_EXT_IRQ) += irq-bcm6345-ext.o - obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o - obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o - obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o --- /dev/null +++ b/drivers/irqchip/irq-bcm6345-ext.c @@ -0,0 +1,280 @@ @@ -371,3 +361,13 @@ Signed-off-by: Jonas Gorski +void bcm6345_ext_intc_init(int n_irqs, int *irqs, void __iomem *reg, int shift); + +#endif /* __INCLUDE_LINUX_IRQCHIP_IRQ_BCM6345_EXT_H */ +--- a/drivers/irqchip/Makefile ++++ b/drivers/irqchip/Makefile +@@ -68,6 +68,7 @@ obj-$(CONFIG_XILINX_INTC) += irq-xilinx + obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o + obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o + obj-$(CONFIG_BCM2712_MIP) += irq-bcm2712-mip.o ++obj-$(CONFIG_BCM6345_EXT_IRQ) += irq-bcm6345-ext.o + obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o + obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o + obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o diff --git a/target/linux/bmips/patches-6.18/202-mips-bmips-tweak-Kconfig-options.patch b/target/linux/bmips/patches-6.18/202-mips-bmips-tweak-Kconfig-options.patch index 406f4d3421d..71742a0dc57 100644 --- a/target/linux/bmips/patches-6.18/202-mips-bmips-tweak-Kconfig-options.patch +++ b/target/linux/bmips/patches-6.18/202-mips-bmips-tweak-Kconfig-options.patch @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -259,19 +259,13 @@ config BMIPS_GENERIC +@@ -260,19 +260,13 @@ config BMIPS_GENERIC select SYNC_R4K select COMMON_CLK select BCM6345_L1_IRQ @@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas select SWAP_IO_SPACE select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN -@@ -281,6 +275,7 @@ config BMIPS_GENERIC +@@ -282,6 +276,7 @@ config BMIPS_GENERIC select HAVE_PCI select PCI_DRIVERS_GENERIC select FW_CFE @@ -43,7 +43,7 @@ Signed-off-by: Álvaro Fernández Rojas BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -123,7 +123,6 @@ config BCM6345_L1_IRQ +@@ -156,7 +156,6 @@ config BCM6345_L1_IRQ config BCM7038_L1_IRQ tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver" depends on ARCH_BRCMSTB || BMIPS_GENERIC @@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas select GENERIC_IRQ_CHIP select IRQ_DOMAIN select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP -@@ -131,14 +130,12 @@ config BCM7038_L1_IRQ +@@ -164,14 +163,12 @@ config BCM7038_L1_IRQ config BCM7120_L2_IRQ tristate "Broadcom STB 7120-style L2 interrupt controller driver" depends on ARCH_BRCMSTB || BMIPS_GENERIC diff --git a/target/linux/bmips/patches-6.18/502-net-mdio-mux-bcm6368-allow-disabling.patch b/target/linux/bmips/patches-6.18/502-net-mdio-mux-bcm6368-allow-disabling.patch index 6556d2c66cd..46f3d40839e 100644 --- a/target/linux/bmips/patches-6.18/502-net-mdio-mux-bcm6368-allow-disabling.patch +++ b/target/linux/bmips/patches-6.18/502-net-mdio-mux-bcm6368-allow-disabling.patch @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/net/mdio/Kconfig +++ b/drivers/net/mdio/Kconfig -@@ -244,7 +244,6 @@ config MDIO_BUS_MUX_BCM6368 +@@ -228,7 +228,6 @@ config MDIO_BUS_MUX_BCM6368 tristate "Broadcom BCM6368 MDIO bus multiplexers" depends on OF && OF_MDIO && (BMIPS_GENERIC || COMPILE_TEST) select MDIO_BUS_MUX diff --git a/target/linux/bmips/patches-6.18/600-mips-bmips-add-pci-support.patch b/target/linux/bmips/patches-6.18/600-mips-bmips-add-pci-support.patch index 76833e3e2db..da0fa0990a5 100644 --- a/target/linux/bmips/patches-6.18/600-mips-bmips-add-pci-support.patch +++ b/target/linux/bmips/patches-6.18/600-mips-bmips-add-pci-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -273,7 +273,6 @@ config BMIPS_GENERIC +@@ -274,7 +274,6 @@ config BMIPS_GENERIC select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select HARDIRQS_SW_RESEND select HAVE_PCI diff --git a/target/linux/bmips/patches-6.18/601-pci-controllers-add-bcm6328-pcie-support.patch b/target/linux/bmips/patches-6.18/601-pci-controllers-add-bcm6328-pcie-support.patch index 4d238330d67..739878e2d20 100644 --- a/target/linux/bmips/patches-6.18/601-pci-controllers-add-bcm6328-pcie-support.patch +++ b/target/linux/bmips/patches-6.18/601-pci-controllers-add-bcm6328-pcie-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig -@@ -173,6 +173,11 @@ config PCI_LOONGSON +@@ -179,6 +179,11 @@ config PCI_LOONGSON Say Y here if you want to enable PCI controller support on Loongson systems. diff --git a/target/linux/bmips/patches-6.18/602-pci-controllers-add-bcm6318-pcie-support.patch b/target/linux/bmips/patches-6.18/602-pci-controllers-add-bcm6318-pcie-support.patch index 979253f7628..d6a922d830c 100644 --- a/target/linux/bmips/patches-6.18/602-pci-controllers-add-bcm6318-pcie-support.patch +++ b/target/linux/bmips/patches-6.18/602-pci-controllers-add-bcm6318-pcie-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig -@@ -173,6 +173,11 @@ config PCI_LOONGSON +@@ -179,6 +179,11 @@ config PCI_LOONGSON Say Y here if you want to enable PCI controller support on Loongson systems. diff --git a/target/linux/bmips/patches-6.18/603-pci-controllers-add-bcm6348-pci-support.patch b/target/linux/bmips/patches-6.18/603-pci-controllers-add-bcm6348-pci-support.patch index 47db062c91b..f997da20d12 100644 --- a/target/linux/bmips/patches-6.18/603-pci-controllers-add-bcm6348-pci-support.patch +++ b/target/linux/bmips/patches-6.18/603-pci-controllers-add-bcm6348-pci-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig -@@ -173,6 +173,11 @@ config PCI_LOONGSON +@@ -179,6 +179,11 @@ config PCI_LOONGSON Say Y here if you want to enable PCI controller support on Loongson systems. diff --git a/target/linux/bmips/patches-6.18/700-leds-add-support-for-Sercomm-MSP430-LED-controller.patch b/target/linux/bmips/patches-6.18/700-leds-add-support-for-Sercomm-MSP430-LED-controller.patch index cb367832ada..fefc08eb646 100644 --- a/target/linux/bmips/patches-6.18/700-leds-add-support-for-Sercomm-MSP430-LED-controller.patch +++ b/target/linux/bmips/patches-6.18/700-leds-add-support-for-Sercomm-MSP430-LED-controller.patch @@ -17,7 +17,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -328,6 +328,15 @@ config LEDS_COBALT_RAQ +@@ -337,6 +337,15 @@ config LEDS_COBALT_RAQ help This option enables support for the Cobalt Raq series LEDs. @@ -35,8 +35,8 @@ Signed-off-by: Álvaro Fernández Rojas depends on LEDS_CLASS_MULTICOLOR --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -81,6 +81,7 @@ obj-$(CONFIG_LEDS_POWERNV) += leds-powe - obj-$(CONFIG_LEDS_PWM) += leds-pwm.o +@@ -85,6 +85,7 @@ obj-$(CONFIG_LEDS_PWM) += leds-pwm.o + obj-$(CONFIG_LEDS_QNAP_MCU) += leds-qnap-mcu.o obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o obj-$(CONFIG_LEDS_SC27XX_BLTC) += leds-sc27xx-bltc.o +obj-$(CONFIG_LEDS_SERCOMM_MSP430) += leds-sercomm-msp430.o