From 618f741494b4bb8744cc5ed1c5af59bc19aec5ff Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 11 Dec 2025 20:35:36 -0800 Subject: [PATCH] treewide: remove of_platform.h include This header is deprecated and typically platform_device.h should be used. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/21164 [Adapted the lantiq patches a bit] Signed-off-by: Hauke Mehrtens --- .../files/drivers/gpio/gpio-latch-mikrotik.c | 1 - .../ath79/files/drivers/gpio/gpio-rb91x-key.c | 1 - .../ath79/files/drivers/mfd/rb4xx-cpld.c | 2 +- .../files/drivers/mtd/nand/raw/rb91x_nand.c | 1 - ...cat-add-dt-driver-for-concat-devices.patch | 2 +- ...-add-IPQ4019-built-in-switch-support.patch | 3 +- .../850-soc-add-qualcomm-syscon.patch | 3 +- .../850-soc-add-qualcomm-syscon.patch | 3 +- ...-MIPS-lantiq-backport-old-timer-code.patch | 5 +- .../028-NET-lantiq-various-etop-fixes.patch | 63 +++++++++---------- ...iq-wifi-and-ethernet-eeprom-handling.patch | 2 +- .../151-lantiq-ifxmips_pcie-use-of.patch | 23 ++++--- .../701-NET-lantiq-etop-of-mido.patch | 8 +-- .../files-6.12/drivers/net/dsa/an8855.c | 1 - ...-add-driver-for-built-in-2.5G-ethern.patch | 2 +- .../825-i2c-MIPS-adds-ralink-I2C-driver.patch | 3 +- .../net/mdio/mdio-realtek-otto-serdes.c | 2 +- ...dd-Realtek-Otto-auxiliary-controller.patch | 2 +- .../drivers/net/ethernet/siflower/sf_dpns.c | 2 +- .../net/ethernet/siflower/sfxgmac-dma.c | 2 +- .../drivers/net/ethernet/siflower/sfxpcs.c | 4 +- 21 files changed, 63 insertions(+), 72 deletions(-) diff --git a/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c b/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c index 05bd1fa6046..6ed1e82a5a7 100644 --- a/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c +++ b/target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c @@ -12,7 +12,6 @@ #include #include #include -#include #define GPIO_LATCH_DRIVER_NAME "gpio-latch-mikrotik" #define GPIO_LATCH_LINES 9 diff --git a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c index 3954cceccd0..9e98d6a55ed 100644 --- a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c +++ b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #define GPIO_RB91X_KEY_DRIVER_NAME "gpio-rb91x-key" diff --git a/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c b/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c index b99a15bb46b..3ec8e519de2 100644 --- a/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c +++ b/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c b/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c index 7ab87bbcd78..d19c4a45cb5 100644 --- a/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c +++ b/target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c @@ -20,7 +20,6 @@ #include #include #include -#include #include diff --git a/target/linux/generic/pending-6.12/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch b/target/linux/generic/pending-6.12/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch index 3d5f5768bc1..cda5e106eb4 100644 --- a/target/linux/generic/pending-6.12/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch +++ b/target/linux/generic/pending-6.12/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch @@ -101,7 +101,7 @@ Signed-off-by: Bernhard Frauendienst +#include +#include +#include -+#include ++#include +#include + +/* diff --git a/target/linux/ipq40xx/patches-6.12/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch b/target/linux/ipq40xx/patches-6.12/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch index c1e46cb4ad6..bbd30e433ce 100644 --- a/target/linux/ipq40xx/patches-6.12/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch +++ b/target/linux/ipq40xx/patches-6.12/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch @@ -78,7 +78,7 @@ Signed-off-by: Robert Marko if (dsa_is_cpu_port(priv->ds, i)) --- /dev/null +++ b/drivers/net/dsa/qca/qca8k-ipq4019.c -@@ -0,0 +1,949 @@ +@@ -0,0 +1,948 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2009 Felix Fietkau @@ -96,7 +96,6 @@ Signed-off-by: Robert Marko +#include +#include +#include -+#include +#include +#include +#include diff --git a/target/linux/ipq40xx/patches-6.12/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq40xx/patches-6.12/850-soc-add-qualcomm-syscon.patch index 579a8cccfb7..00221f7e0e8 100644 --- a/target/linux/ipq40xx/patches-6.12/850-soc-add-qualcomm-syscon.patch +++ b/target/linux/ipq40xx/patches-6.12/850-soc-add-qualcomm-syscon.patch @@ -23,7 +23,7 @@ Subject: SoC: add qualcomm syscon +obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o --- /dev/null +++ b/drivers/soc/qcom/qcom_tcsr.c -@@ -0,0 +1,95 @@ +@@ -0,0 +1,94 @@ +/* + * Copyright (c) 2014, The Linux foundation. All rights reserved. + * @@ -42,7 +42,6 @@ Subject: SoC: add qualcomm syscon +#include +#include +#include -+#include +#include + +#define TCSR_USB_PORT_SEL 0xb0 diff --git a/target/linux/ipq806x/patches-6.12/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq806x/patches-6.12/850-soc-add-qualcomm-syscon.patch index 8b374b8c151..7f4f6b324c9 100644 --- a/target/linux/ipq806x/patches-6.12/850-soc-add-qualcomm-syscon.patch +++ b/target/linux/ipq806x/patches-6.12/850-soc-add-qualcomm-syscon.patch @@ -28,7 +28,7 @@ Subject: SoC: add qualcomm syscon depends on ARCH_QCOM || COMPILE_TEST --- /dev/null +++ b/drivers/soc/qcom/qcom_tcsr.c -@@ -0,0 +1,61 @@ +@@ -0,0 +1,60 @@ +/* + * Copyright (c) 2014, The Linux foundation. All rights reserved. + * @@ -47,7 +47,6 @@ Subject: SoC: add qualcomm syscon +#include +#include +#include -+#include +#include + +#define TCSR_USB_PORT_SEL 0xb0 diff --git a/target/linux/lantiq/patches-6.12/008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-6.12/008-MIPS-lantiq-backport-old-timer-code.patch index 08977b111b5..a976df93d7f 100644 --- a/target/linux/lantiq/patches-6.12/008-MIPS-lantiq-backport-old-timer-code.patch +++ b/target/linux/lantiq/patches-6.12/008-MIPS-lantiq-backport-old-timer-code.patch @@ -186,11 +186,12 @@ Signed-off-by: John Crispin obj-y += vmmc.o --- /dev/null +++ b/arch/mips/lantiq/xway/timer.c -@@ -0,0 +1,889 @@ +@@ -0,0 +1,890 @@ +#ifndef CONFIG_SOC_AMAZON_SE + +#include +#include ++#include +#include +#include +#include @@ -204,7 +205,7 @@ Signed-off-by: John Crispin +#include +#include + -+#include ++#include + +#include +#include diff --git a/target/linux/lantiq/patches-6.12/028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-6.12/028-NET-lantiq-various-etop-fixes.patch index fff60cefafe..90982b59104 100644 --- a/target/linux/lantiq/patches-6.12/028-NET-lantiq-various-etop-fixes.patch +++ b/target/linux/lantiq/patches-6.12/028-NET-lantiq-various-etop-fixes.patch @@ -19,7 +19,7 @@ Signed-off-by: John Crispin */ #include -@@ -20,12 +20,17 @@ +@@ -20,12 +20,16 @@ #include #include #include @@ -33,11 +33,10 @@ Signed-off-by: John Crispin +#include +#include +#include -+#include #include -@@ -33,7 +38,7 @@ +@@ -33,7 +37,7 @@ #include #include @@ -46,7 +45,7 @@ Signed-off-by: John Crispin #define MDIO_REQUEST 0x80000000 #define MDIO_READ 0x40000000 #define MDIO_ADDR_MASK 0x1f -@@ -42,44 +47,91 @@ +@@ -42,44 +46,91 @@ #define MDIO_REG_OFFSET 0x10 #define MDIO_VAL_MASK 0xffff @@ -153,7 +152,7 @@ Signed-off-by: John Crispin struct net_device *netdev; struct napi_struct napi; struct ltq_dma_channel dma; -@@ -89,25 +141,39 @@ struct ltq_etop_chan { +@@ -89,25 +140,39 @@ struct ltq_etop_chan { struct ltq_etop_priv { struct net_device *netdev; struct platform_device *pdev; @@ -196,7 +195,7 @@ Signed-off-by: John Crispin if (!ch->skb[ch->dma.desc]) return -ENOMEM; ch->dma.desc_base[ch->dma.desc].addr = -@@ -142,8 +208,11 @@ ltq_etop_hw_receive(struct ltq_etop_chan +@@ -142,8 +207,11 @@ ltq_etop_hw_receive(struct ltq_etop_chan spin_unlock_irqrestore(&priv->lock, flags); skb_put(skb, len); @@ -208,7 +207,7 @@ Signed-off-by: John Crispin } static int -@@ -151,7 +220,9 @@ ltq_etop_poll_rx(struct napi_struct *nap +@@ -151,7 +219,9 @@ ltq_etop_poll_rx(struct napi_struct *nap { struct ltq_etop_chan *ch = container_of(napi, struct ltq_etop_chan, napi); @@ -218,7 +217,7 @@ Signed-off-by: John Crispin while (work_done < budget) { struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc]; -@@ -163,7 +234,9 @@ ltq_etop_poll_rx(struct napi_struct *nap +@@ -163,7 +233,9 @@ ltq_etop_poll_rx(struct napi_struct *nap } if (work_done < budget) { napi_complete_done(&ch->napi, work_done); @@ -228,7 +227,7 @@ Signed-off-by: John Crispin } return work_done; } -@@ -175,12 +248,14 @@ ltq_etop_poll_tx(struct napi_struct *nap +@@ -175,12 +247,14 @@ ltq_etop_poll_tx(struct napi_struct *nap container_of(napi, struct ltq_etop_chan, napi); struct ltq_etop_priv *priv = netdev_priv(ch->netdev); struct netdev_queue *txq = @@ -244,7 +243,7 @@ Signed-off-by: John Crispin dev_kfree_skb_any(ch->skb[ch->tx_free]); ch->skb[ch->tx_free] = NULL; memset(&ch->dma.desc_base[ch->tx_free], 0, -@@ -193,7 +268,9 @@ ltq_etop_poll_tx(struct napi_struct *nap +@@ -193,7 +267,9 @@ ltq_etop_poll_tx(struct napi_struct *nap if (netif_tx_queue_stopped(txq)) netif_tx_start_queue(txq); napi_complete(&ch->napi); @@ -254,7 +253,7 @@ Signed-off-by: John Crispin return 1; } -@@ -201,9 +278,11 @@ static irqreturn_t +@@ -201,9 +277,11 @@ static irqreturn_t ltq_etop_dma_irq(int irq, void *_priv) { struct ltq_etop_priv *priv = _priv; @@ -268,7 +267,7 @@ Signed-off-by: John Crispin return IRQ_HANDLED; } -@@ -215,7 +294,7 @@ ltq_etop_free_channel(struct net_device +@@ -215,7 +293,7 @@ ltq_etop_free_channel(struct net_device ltq_dma_free(&ch->dma); if (ch->dma.irq) free_irq(ch->dma.irq, priv); @@ -277,7 +276,7 @@ Signed-off-by: John Crispin struct ltq_dma_channel *dma = &ch->dma; for (dma->desc = 0; dma->desc < LTQ_DESC_NUM; dma->desc++) -@@ -227,80 +306,137 @@ static void +@@ -227,80 +305,137 @@ static void ltq_etop_hw_exit(struct net_device *dev) { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -464,7 +463,7 @@ Signed-off-by: John Crispin } static void -@@ -319,6 +455,39 @@ static const struct ethtool_ops ltq_etop +@@ -319,6 +454,39 @@ static const struct ethtool_ops ltq_etop }; static int @@ -504,7 +503,7 @@ Signed-off-by: John Crispin ltq_etop_mdio_wr(struct mii_bus *bus, int phy_addr, int phy_reg, u16 phy_data) { u32 val = MDIO_REQUEST | -@@ -326,9 +495,9 @@ ltq_etop_mdio_wr(struct mii_bus *bus, in +@@ -326,9 +494,9 @@ ltq_etop_mdio_wr(struct mii_bus *bus, in ((phy_reg & MDIO_REG_MASK) << MDIO_REG_OFFSET) | phy_data; @@ -516,7 +515,7 @@ Signed-off-by: John Crispin return 0; } -@@ -339,12 +508,12 @@ ltq_etop_mdio_rd(struct mii_bus *bus, in +@@ -339,12 +507,12 @@ ltq_etop_mdio_rd(struct mii_bus *bus, in ((phy_addr & MDIO_ADDR_MASK) << MDIO_ADDR_OFFSET) | ((phy_reg & MDIO_REG_MASK) << MDIO_REG_OFFSET); @@ -533,7 +532,7 @@ Signed-off-by: John Crispin return val; } -@@ -360,7 +529,10 @@ ltq_etop_mdio_probe(struct net_device *d +@@ -360,7 +528,10 @@ ltq_etop_mdio_probe(struct net_device *d struct ltq_etop_priv *priv = netdev_priv(dev); struct phy_device *phydev; @@ -545,7 +544,7 @@ Signed-off-by: John Crispin if (!phydev) { netdev_err(dev, "no PHY found\n"); -@@ -368,14 +540,17 @@ ltq_etop_mdio_probe(struct net_device *d +@@ -368,14 +539,17 @@ ltq_etop_mdio_probe(struct net_device *d } phydev = phy_connect(dev, phydev_name(phydev), @@ -565,7 +564,7 @@ Signed-off-by: John Crispin phy_attached_info(phydev); -@@ -396,8 +571,13 @@ ltq_etop_mdio_init(struct net_device *de +@@ -396,8 +570,13 @@ ltq_etop_mdio_init(struct net_device *de } priv->mii_bus->priv = dev; @@ -581,7 +580,7 @@ Signed-off-by: John Crispin priv->mii_bus->name = "ltq_mii"; snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", priv->pdev->name, priv->pdev->id); -@@ -434,18 +614,21 @@ static int +@@ -434,18 +613,21 @@ static int ltq_etop_open(struct net_device *dev) { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -613,7 +612,7 @@ Signed-off-by: John Crispin netif_tx_start_all_queues(dev); return 0; } -@@ -454,18 +637,19 @@ static int +@@ -454,18 +636,19 @@ static int ltq_etop_stop(struct net_device *dev) { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -643,7 +642,7 @@ Signed-off-by: John Crispin return 0; } -@@ -475,17 +659,21 @@ ltq_etop_tx(struct sk_buff *skb, struct +@@ -475,17 +658,21 @@ ltq_etop_tx(struct sk_buff *skb, struct int queue = skb_get_queue_mapping(skb); struct netdev_queue *txq = netdev_get_tx_queue(dev, queue); struct ltq_etop_priv *priv = netdev_priv(dev); @@ -670,7 +669,7 @@ Signed-off-by: John Crispin netdev_err(dev, "tx ring full\n"); netif_tx_stop_queue(txq); return NETDEV_TX_BUSY; -@@ -493,7 +681,7 @@ ltq_etop_tx(struct sk_buff *skb, struct +@@ -493,7 +680,7 @@ ltq_etop_tx(struct sk_buff *skb, struct /* dma needs to start on a burst length value aligned address */ byte_offset = CPHYSADDR(skb->data) % (priv->tx_burst_len * 4); @@ -679,7 +678,7 @@ Signed-off-by: John Crispin netif_trans_update(dev); -@@ -504,11 +692,11 @@ ltq_etop_tx(struct sk_buff *skb, struct +@@ -504,11 +691,11 @@ ltq_etop_tx(struct sk_buff *skb, struct wmb(); desc->ctl = LTQ_DMA_OWN | LTQ_DMA_SOP | LTQ_DMA_EOP | LTQ_DMA_TX_OFFSET(byte_offset) | (len & LTQ_DMA_SIZE_MASK); @@ -694,7 +693,7 @@ Signed-off-by: John Crispin netif_tx_stop_queue(txq); return NETDEV_TX_OK; -@@ -519,11 +707,14 @@ ltq_etop_change_mtu(struct net_device *d +@@ -519,11 +706,14 @@ ltq_etop_change_mtu(struct net_device *d { struct ltq_etop_priv *priv = netdev_priv(dev); unsigned long flags; @@ -710,7 +709,7 @@ Signed-off-by: John Crispin spin_unlock_irqrestore(&priv->lock, flags); return 0; -@@ -576,6 +767,9 @@ ltq_etop_init(struct net_device *dev) +@@ -576,6 +766,9 @@ ltq_etop_init(struct net_device *dev) if (err) goto err_hw; ltq_etop_change_mtu(dev, 1500); @@ -720,7 +719,7 @@ Signed-off-by: John Crispin memcpy(&mac, &priv->pldata->mac, sizeof(struct sockaddr)); if (!is_valid_ether_addr(mac.sa_data)) { -@@ -593,9 +787,10 @@ ltq_etop_init(struct net_device *dev) +@@ -593,9 +786,10 @@ ltq_etop_init(struct net_device *dev) dev->addr_assign_type = NET_ADDR_RANDOM; ltq_etop_set_multicast_list(dev); @@ -734,7 +733,7 @@ Signed-off-by: John Crispin return 0; err_netdev: -@@ -615,6 +810,9 @@ ltq_etop_tx_timeout(struct net_device *d +@@ -615,6 +809,9 @@ ltq_etop_tx_timeout(struct net_device *d err = ltq_etop_hw_init(dev); if (err) goto err_hw; @@ -744,7 +743,7 @@ Signed-off-by: John Crispin netif_trans_update(dev); netif_wake_queue(dev); return; -@@ -638,14 +836,18 @@ static const struct net_device_ops ltq_e +@@ -638,14 +835,18 @@ static const struct net_device_ops ltq_e .ndo_tx_timeout = ltq_etop_tx_timeout, }; @@ -767,7 +766,7 @@ Signed-off-by: John Crispin res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -671,18 +873,54 @@ ltq_etop_probe(struct platform_device *p +@@ -671,18 +872,54 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -828,7 +827,7 @@ Signed-off-by: John Crispin spin_lock_init(&priv->lock); SET_NETDEV_DEV(dev, &pdev->dev); -@@ -698,15 +936,10 @@ ltq_etop_probe(struct platform_device *p +@@ -698,15 +935,10 @@ ltq_etop_probe(struct platform_device *p goto err_free; } @@ -848,7 +847,7 @@ Signed-off-by: John Crispin err = register_netdev(dev); if (err) -@@ -733,31 +966,22 @@ static void ltq_etop_remove(struct platf +@@ -733,31 +965,22 @@ static void ltq_etop_remove(struct platf } } diff --git a/target/linux/lantiq/patches-6.12/035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-6.12/035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index b36b40779f1..10f2d4086d3 100644 --- a/target/linux/lantiq/patches-6.12/035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-6.12/035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -224,7 +224,7 @@ Signed-off-by: John Crispin --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c -@@ -771,7 +771,11 @@ ltq_etop_init(struct net_device *dev) +@@ -770,7 +770,11 @@ ltq_etop_init(struct net_device *dev) if (err) goto err_hw; diff --git a/target/linux/lantiq/patches-6.12/151-lantiq-ifxmips_pcie-use-of.patch b/target/linux/lantiq/patches-6.12/151-lantiq-ifxmips_pcie-use-of.patch index 92e0f4830ef..b7bbdf7783f 100644 --- a/target/linux/lantiq/patches-6.12/151-lantiq-ifxmips_pcie-use-of.patch +++ b/target/linux/lantiq/patches-6.12/151-lantiq-ifxmips_pcie-use-of.patch @@ -23,7 +23,7 @@ Signed-off-by: Eddi De Pieri obj-$(CONFIG_SOC_TX4938) += pci-tx4938.o --- a/arch/mips/pci/ifxmips_pcie.c +++ b/arch/mips/pci/ifxmips_pcie.c -@@ -16,8 +16,16 @@ +@@ -16,8 +16,15 @@ #include #include #include @@ -34,13 +34,12 @@ Signed-off-by: Eddi De Pieri #include +#include -+#include +#include + #include "ifxmips_pcie.h" #include "ifxmips_pcie_reg.h" -@@ -25,11 +33,6 @@ +@@ -25,11 +32,6 @@ #define IFX_PCIE_ERROR_INT #define IFX_PCIE_IO_32BIT @@ -52,7 +51,7 @@ Signed-off-by: Eddi De Pieri #define MS(_v, _f) (((_v) & (_f)) >> _f##_S) #define SM(_v, _f) (((_v) << _f##_S) & (_f)) #define IFX_REG_SET_BIT(_f, _r) \ -@@ -40,30 +43,30 @@ +@@ -40,30 +42,30 @@ static DEFINE_SPINLOCK(ifx_pcie_lock); u32 g_pcie_debug_flag = PCIE_MSG_ANY & (~PCIE_MSG_CFG); @@ -88,7 +87,7 @@ Signed-off-by: Eddi De Pieri }, }, }, -@@ -82,6 +85,22 @@ void ifx_pcie_debug(const char *fmt, ... +@@ -82,6 +84,22 @@ void ifx_pcie_debug(const char *fmt, ... printk("%s", buf); } @@ -111,7 +110,7 @@ Signed-off-by: Eddi De Pieri static inline int pcie_ltssm_enable(int pcie_port) { -@@ -857,7 +876,8 @@ pcie_rc_core_int_init(int pcie_port) +@@ -857,7 +875,8 @@ pcie_rc_core_int_init(int pcie_port) ret = request_irq(pcie_irqs[pcie_port].ir_irq.irq, pcie_rc_core_isr, 0, pcie_irqs[pcie_port].ir_irq.name, &ifx_pcie_controller[pcie_port]); if (ret) @@ -121,7 +120,7 @@ Signed-off-by: Eddi De Pieri return ret; } -@@ -988,10 +1008,26 @@ int ifx_pcie_bios_plat_dev_init(struct +@@ -988,10 +1007,26 @@ int ifx_pcie_bios_plat_dev_init(struct static int pcie_rc_initialize(int pcie_port) { @@ -150,7 +149,7 @@ Signed-off-by: Eddi De Pieri pcie_ep_gpio_rst_init(pcie_port); -@@ -1000,26 +1036,21 @@ pcie_rc_initialize(int pcie_port) +@@ -1000,26 +1035,21 @@ pcie_rc_initialize(int pcie_port) * reset PCIe PHY will solve this issue */ for (i = 0; i < IFX_PCIE_PHY_LOOP_CNT; i++) { @@ -187,7 +186,7 @@ Signed-off-by: Eddi De Pieri /* Enable PCIe PHY and Clock */ pcie_core_pmu_setup(pcie_port); -@@ -1035,6 +1066,10 @@ pcie_rc_initialize(int pcie_port) +@@ -1035,6 +1065,10 @@ pcie_rc_initialize(int pcie_port) /* Once link is up, break out */ if (pcie_app_loigc_setup(pcie_port) == 0) break; @@ -198,7 +197,7 @@ Signed-off-by: Eddi De Pieri } if (i >= IFX_PCIE_PHY_LOOP_CNT) { printk(KERN_ERR "%s link up failed!!!!!\n", __func__); -@@ -1045,17 +1080,73 @@ pcie_rc_initialize(int pcie_port) +@@ -1045,17 +1079,73 @@ pcie_rc_initialize(int pcie_port) return 0; } @@ -274,7 +273,7 @@ Signed-off-by: Eddi De Pieri for (pcie_port = startup_port; pcie_port < IFX_PCIE_CORE_NR; pcie_port++){ if (pcie_rc_initialize(pcie_port) == 0) { IFX_PCIE_PRINT(PCIE_MSG_INIT, "%s: ifx_pcie_cfg_base 0x%p\n", -@@ -1066,7 +1157,19 @@ static int __init ifx_pcie_bios_init(voi +@@ -1066,7 +1156,19 @@ static int __init ifx_pcie_bios_init(voi IFX_PCIE_PRINT(PCIE_MSG_ERR, "%s io space ioremap failed\n", __func__); return -ENOMEM; } @@ -294,7 +293,7 @@ Signed-off-by: Eddi De Pieri register_pci_controller(&ifx_pcie_controller[pcie_port].pcic); /* XXX, clear error status */ -@@ -1083,6 +1186,29 @@ static int __init ifx_pcie_bios_init(voi +@@ -1083,6 +1185,29 @@ static int __init ifx_pcie_bios_init(voi return 0; } diff --git a/target/linux/lantiq/patches-6.12/701-NET-lantiq-etop-of-mido.patch b/target/linux/lantiq/patches-6.12/701-NET-lantiq-etop-of-mido.patch index d80cdb08723..d4c7b4ff23f 100644 --- a/target/linux/lantiq/patches-6.12/701-NET-lantiq-etop-of-mido.patch +++ b/target/linux/lantiq/patches-6.12/701-NET-lantiq-etop-of-mido.patch @@ -10,15 +10,15 @@ Signed-off-by: Johann Neuhauser --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c -@@ -31,6 +31,7 @@ +@@ -30,6 +30,7 @@ + #include #include #include - #include +#include #include -@@ -561,7 +562,8 @@ static int +@@ -560,7 +561,8 @@ static int ltq_etop_mdio_init(struct net_device *dev) { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -28,7 +28,7 @@ Signed-off-by: Johann Neuhauser priv->mii_bus = mdiobus_alloc(); if (!priv->mii_bus) { -@@ -581,7 +583,15 @@ ltq_etop_mdio_init(struct net_device *de +@@ -580,7 +582,15 @@ ltq_etop_mdio_init(struct net_device *de priv->mii_bus->name = "ltq_mii"; snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", priv->pdev->name, priv->pdev->id); diff --git a/target/linux/mediatek/files-6.12/drivers/net/dsa/an8855.c b/target/linux/mediatek/files-6.12/drivers/net/dsa/an8855.c index e6666d2011c..47a7d9b625b 100644 --- a/target/linux/mediatek/files-6.12/drivers/net/dsa/an8855.c +++ b/target/linux/mediatek/files-6.12/drivers/net/dsa/an8855.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/target/linux/mediatek/patches-6.12/701-net-phy-mediatek-add-driver-for-built-in-2.5G-ethern.patch b/target/linux/mediatek/patches-6.12/701-net-phy-mediatek-add-driver-for-built-in-2.5G-ethern.patch index 19b347f57cc..55c13721578 100644 --- a/target/linux/mediatek/patches-6.12/701-net-phy-mediatek-add-driver-for-built-in-2.5G-ethern.patch +++ b/target/linux/mediatek/patches-6.12/701-net-phy-mediatek-add-driver-for-built-in-2.5G-ethern.patch @@ -61,7 +61,7 @@ Signed-off-by: Sky Huang +#include +#include +#include -+#include ++#include +#include +#include +#include diff --git a/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch index c0df6819561..5bed8ea448e 100644 --- a/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -69,7 +69,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_I2C_QUP) += i2c-qup.o --- /dev/null +++ b/drivers/i2c/busses/i2c-ralink.c -@@ -0,0 +1,397 @@ +@@ -0,0 +1,396 @@ +/* + * drivers/i2c/busses/i2c-ralink.c + * @@ -99,7 +99,6 @@ Signed-off-by: John Crispin +#include +#include +#include -+#include +#include +#include +#include diff --git a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto-serdes.c b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto-serdes.c index 9ae62bfc4fa..c0d444dc2cd 100644 --- a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto-serdes.c +++ b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto-serdes.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/target/linux/realtek/patches-6.12/723-net-mdio-Add-Realtek-Otto-auxiliary-controller.patch b/target/linux/realtek/patches-6.12/723-net-mdio-Add-Realtek-Otto-auxiliary-controller.patch index ad11b907529..ac6cb1bc209 100644 --- a/target/linux/realtek/patches-6.12/723-net-mdio-Add-Realtek-Otto-auxiliary-controller.patch +++ b/target/linux/realtek/patches-6.12/723-net-mdio-Add-Realtek-Otto-auxiliary-controller.patch @@ -57,7 +57,7 @@ Signed-off-by: Sander Vanheule +#include +#include +#include -+#include ++#include +#include +#include +#include diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c index 67c949f56a6..db178700b42 100644 --- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c +++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c index 8143bd078d1..923f77732f1 100644 --- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c +++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.c index ae20940f5ac..ace17aba36e 100644 --- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.c +++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxpcs.c @@ -3,11 +3,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include -- 2.47.3