diff --git a/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch b/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch index 7b4444109..59e4b365a 100644 --- a/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch +++ b/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch @@ -94,7 +94,7 @@ Cc: linux-tegra@vger.kernel.org ret = dw_pcie_host_init(pp); --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c -@@ -853,12 +853,6 @@ static int imx6_add_pcie_port(struct imx +@@ -858,12 +858,6 @@ static int imx6_add_pcie_port(struct imx struct device *dev = &pdev->dev; int ret; @@ -229,7 +229,7 @@ Cc: linux-tegra@vger.kernel.org return dw_pcie_host_init(&pci->pp); --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c -@@ -1434,14 +1434,6 @@ static int qcom_pcie_probe(struct platfo +@@ -1428,14 +1428,6 @@ static int qcom_pcie_probe(struct platfo pp->ops = &qcom_pcie_dw_ops; @@ -242,8 +242,8 @@ Cc: linux-tegra@vger.kernel.org - } - ret = phy_init(pcie->phy); - if (ret) { - pm_runtime_disable(&pdev->dev); + if (ret) + goto err_pm_runtime_put; --- a/drivers/pci/controller/dwc/pcie-spear13xx.c +++ b/drivers/pci/controller/dwc/pcie-spear13xx.c @@ -183,6 +183,7 @@ static int spear13xx_add_pcie_port(struc diff --git a/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch b/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch index eac6c12fa..a92518725 100644 --- a/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch +++ b/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch @@ -124,7 +124,7 @@ Cc: linuxppc-dev@lists.ozlabs.org if (!pp->msi_irq) { pp->msi_irq = platform_get_irq_byname_optional(pdev, "msi"); if (pp->msi_irq < 0) { -@@ -395,10 +403,6 @@ int dw_pcie_host_init(struct pcie_port * +@@ -396,10 +404,6 @@ int dw_pcie_host_init(struct pcie_port * pp->msi_data = 0; goto err_free_msi; } @@ -135,7 +135,7 @@ Cc: linuxppc-dev@lists.ozlabs.org } } -@@ -419,7 +423,7 @@ int dw_pcie_host_init(struct pcie_port * +@@ -420,7 +424,7 @@ int dw_pcie_host_init(struct pcie_port * return 0; err_free_msi: @@ -144,7 +144,7 @@ Cc: linuxppc-dev@lists.ozlabs.org dw_pcie_free_msi(pp); return ret; } -@@ -429,7 +433,7 @@ void dw_pcie_host_deinit(struct pcie_por +@@ -430,7 +434,7 @@ void dw_pcie_host_deinit(struct pcie_por { pci_stop_root_bus(pp->bridge->bus); pci_remove_root_bus(pp->bridge->bus); @@ -153,7 +153,7 @@ Cc: linuxppc-dev@lists.ozlabs.org dw_pcie_free_msi(pp); } EXPORT_SYMBOL_GPL(dw_pcie_host_deinit); -@@ -540,7 +544,7 @@ void dw_pcie_setup_rc(struct pcie_port * +@@ -541,7 +545,7 @@ void dw_pcie_setup_rc(struct pcie_port * dw_pcie_setup(pci); diff --git a/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch b/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch index bf28d890b..faabd1768 100644 --- a/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch +++ b/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch @@ -150,7 +150,7 @@ Cc: linux-tegra@vger.kernel.org static int __init exynos_pcie_probe(struct platform_device *pdev) --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c -@@ -745,9 +745,9 @@ static void imx6_pcie_ltssm_enable(struc +@@ -750,9 +750,9 @@ static void imx6_pcie_ltssm_enable(struc } } @@ -162,7 +162,7 @@ Cc: linux-tegra@vger.kernel.org struct device *dev = pci->dev; u8 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); u32 tmp; -@@ -835,7 +835,6 @@ static int imx6_pcie_host_init(struct pc +@@ -840,7 +840,6 @@ static int imx6_pcie_host_init(struct pc imx6_pcie_deassert_core_reset(imx6_pcie); imx6_setup_phy_mpll(imx6_pcie); dw_pcie_setup_rc(pp); @@ -170,7 +170,7 @@ Cc: linux-tegra@vger.kernel.org dw_pcie_msi_init(pp); return 0; -@@ -865,7 +864,7 @@ static int imx6_add_pcie_port(struct imx +@@ -870,7 +869,7 @@ static int imx6_add_pcie_port(struct imx } static const struct dw_pcie_ops dw_pcie_ops = { @@ -179,7 +179,7 @@ Cc: linux-tegra@vger.kernel.org }; #ifdef CONFIG_PM_SLEEP -@@ -974,7 +973,7 @@ static int imx6_pcie_resume_noirq(struct +@@ -979,7 +978,7 @@ static int imx6_pcie_resume_noirq(struct imx6_pcie_deassert_core_reset(imx6_pcie); dw_pcie_setup_rc(pp); @@ -354,7 +354,7 @@ Cc: linux-tegra@vger.kernel.org return 0; --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c -@@ -416,6 +416,15 @@ int dw_pcie_host_init(struct pcie_port * +@@ -417,6 +417,15 @@ int dw_pcie_host_init(struct pcie_port * goto err_free_msi; } @@ -525,7 +525,7 @@ Cc: linux-tegra@vger.kernel.org } static void qcom_pcie_2_1_0_ltssm_enable(struct qcom_pcie *pcie) -@@ -1290,15 +1287,8 @@ static int qcom_pcie_host_init(struct pc +@@ -1284,15 +1281,8 @@ static int qcom_pcie_host_init(struct pc qcom_ep_reset_deassert(pcie); @@ -542,7 +542,7 @@ Cc: linux-tegra@vger.kernel.org err_disable_phy: phy_power_off(pcie->phy); err_deinit: -@@ -1365,6 +1355,7 @@ static const struct qcom_pcie_ops ops_2_ +@@ -1359,6 +1349,7 @@ static const struct qcom_pcie_ops ops_2_ static const struct dw_pcie_ops dw_pcie_ops = { .link_up = qcom_pcie_link_up, diff --git a/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch b/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch index 935d55543..9a168ed97 100644 --- a/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch +++ b/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch @@ -91,7 +91,7 @@ Cc: linux-tegra@vger.kernel.org val |= IRQ_MSI_ENABLE; --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c -@@ -835,7 +835,6 @@ static int imx6_pcie_host_init(struct pc +@@ -840,7 +840,6 @@ static int imx6_pcie_host_init(struct pc imx6_pcie_deassert_core_reset(imx6_pcie); imx6_setup_phy_mpll(imx6_pcie); dw_pcie_setup_rc(pp); @@ -152,7 +152,7 @@ Cc: linux-tegra@vger.kernel.org int dw_pcie_host_init(struct pcie_port *pp) { -@@ -416,6 +415,8 @@ int dw_pcie_host_init(struct pcie_port * +@@ -417,6 +416,8 @@ int dw_pcie_host_init(struct pcie_port * goto err_free_msi; } @@ -220,7 +220,7 @@ Cc: linux-tegra@vger.kernel.org } --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c -@@ -1283,8 +1283,6 @@ static int qcom_pcie_host_init(struct pc +@@ -1277,8 +1277,6 @@ static int qcom_pcie_host_init(struct pc } dw_pcie_setup_rc(pp); diff --git a/target/linux/ipq807x/patches-5.10/115-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch b/target/linux/ipq807x/patches-5.10/115-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch index 4b9a37885..f2e45f2f4 100644 --- a/target/linux/ipq807x/patches-5.10/115-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch +++ b/target/linux/ipq807x/patches-5.10/115-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch @@ -357,7 +357,7 @@ Signed-off-by: Robert Marko fixed->hw.init = &init; ret = devm_clk_hw_register(qmp->dev, &fixed->hw); -@@ -3859,6 +4023,9 @@ static const struct of_device_id qcom_qm +@@ -3868,6 +4032,9 @@ static const struct of_device_id qcom_qm .compatible = "qcom,ipq8074-qmp-pcie-phy", .data = &ipq8074_pciephy_cfg, }, { diff --git a/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch b/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch index 382ca98dd..5c711d12b 100644 --- a/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch +++ b/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch @@ -73,7 +73,7 @@ Signed-off-by: Baruch Siach }; struct qcom_pcie; -@@ -1252,6 +1268,130 @@ static void qcom_pcie_post_deinit_2_7_0( +@@ -1246,6 +1262,130 @@ static void qcom_pcie_post_deinit_2_7_0( clk_disable_unprepare(res->pipe_clk); } @@ -204,7 +204,7 @@ Signed-off-by: Baruch Siach static int qcom_pcie_link_up(struct dw_pcie *pci) { u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); -@@ -1351,6 +1491,15 @@ static const struct qcom_pcie_ops ops_2_ +@@ -1345,6 +1485,15 @@ static const struct qcom_pcie_ops ops_2_ .post_deinit = qcom_pcie_post_deinit_2_7_0, }; @@ -220,7 +220,7 @@ Signed-off-by: Baruch Siach static const struct dw_pcie_ops dw_pcie_ops = { .link_up = qcom_pcie_link_up, .start_link = qcom_pcie_start_link, -@@ -1457,6 +1606,7 @@ static const struct of_device_id qcom_pc +@@ -1450,6 +1599,7 @@ static const struct of_device_id qcom_pc { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 }, diff --git a/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch b/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch index 0cb6aa89c..71306caa2 100644 --- a/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch +++ b/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch @@ -25,7 +25,7 @@ Signed-off-by: Robert Marko struct reset_control *rst; }; -@@ -1279,8 +1279,10 @@ static int qcom_pcie_get_resources_2_9_0 +@@ -1273,8 +1273,10 @@ static int qcom_pcie_get_resources_2_9_0 res->clks[0].id = "iface"; res->clks[1].id = "axi_m"; res->clks[2].id = "axi_s"; @@ -38,7 +38,7 @@ Signed-off-by: Robert Marko ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks); if (ret < 0) -@@ -1608,6 +1610,7 @@ static const struct of_device_id qcom_pc +@@ -1601,6 +1603,7 @@ static const struct of_device_id qcom_pc { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 }, { .compatible = "qcom,pcie-ipq6018", .data = &ops_2_9_0 }, diff --git a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 2f841558f..7f9e336a8 100644 --- a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -620,7 +620,7 @@ #endif --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -7255,3 +7255,35 @@ void addrconf_cleanup(void) +@@ -7274,3 +7274,35 @@ void addrconf_cleanup(void) destroy_workqueue(addrconf_wq); } diff --git a/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch b/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch index 05066121d..0abebbe5e 100644 --- a/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch +++ b/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch @@ -31,7 +31,7 @@ Change-Id: Ib3cd341e5b2d4dcf552e02e38d3f34a4f00351cd __u8 redirected:1; --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -754,6 +754,40 @@ static inline bool skb_skip_tc_classify( +@@ -740,6 +740,40 @@ static inline bool skb_skip_tc_classify( return false; } diff --git a/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch b/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch index 0e78c934c..1bc1604d2 100644 --- a/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch +++ b/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch @@ -35,7 +35,7 @@ Change-Id: Iddb97d6ba0a443b830d1ac23728434a417bc8a92 __u8 redirected:1; --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -757,31 +757,31 @@ static inline bool skb_skip_tc_classify( +@@ -743,31 +743,31 @@ static inline bool skb_skip_tc_classify( /* * Set skb classify bit field. */ diff --git a/target/linux/ipq807x/patches-5.10/720-net-phy-add-aqr-phys.patch b/target/linux/ipq807x/patches-5.10/720-net-phy-add-aqr-phys.patch index 4d4420aa2..f7dd2f718 100644 --- a/target/linux/ipq807x/patches-5.10/720-net-phy-add-aqr-phys.patch +++ b/target/linux/ipq807x/patches-5.10/720-net-phy-add-aqr-phys.patch @@ -20,7 +20,7 @@ Signed-off-by: Birger Koblitz #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) -@@ -330,6 +332,49 @@ static int aqr107_read_rate(struct phy_d +@@ -343,6 +345,49 @@ static int aqr107_read_rate(struct phy_d return 0; } @@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz static int aqr107_read_status(struct phy_device *phydev) { int val, ret; -@@ -460,7 +505,7 @@ static void aqr107_chip_info(struct phy_ +@@ -473,7 +518,7 @@ static void aqr107_chip_info(struct phy_ build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val); prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val); @@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz fw_major, fw_minor, build_id, prov_id); } -@@ -632,6 +677,24 @@ static struct phy_driver aqr_driver[] = +@@ -645,6 +690,24 @@ static struct phy_driver aqr_driver[] = .link_change_notify = aqr107_link_change_notify, }, { @@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz PHY_ID_MATCH_MODEL(PHY_ID_AQCS109), .name = "Aquantia AQCS109", .probe = aqr107_probe, -@@ -657,6 +720,24 @@ static struct phy_driver aqr_driver[] = +@@ -670,6 +733,24 @@ static struct phy_driver aqr_driver[] = .ack_interrupt = aqr_ack_interrupt, .read_status = aqr_read_status, }, @@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz }; module_phy_driver(aqr_driver); -@@ -667,8 +748,10 @@ static struct mdio_device_id __maybe_unu +@@ -680,8 +761,10 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, diff --git a/target/linux/ipq807x/patches-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/ipq807x/patches-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch index e3541400d..ae85a21f9 100644 --- a/target/linux/ipq807x/patches-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch +++ b/target/linux/ipq807x/patches-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch @@ -27,7 +27,7 @@ Signed-off-by: Alex Marginean #define PHY_ID_AQR813 0x31c31cb2 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 -@@ -123,6 +125,29 @@ +@@ -125,6 +127,29 @@ #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) @@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean struct aqr107_hw_stat { const char *name; int reg; -@@ -243,6 +268,51 @@ static int aqr_config_aneg(struct phy_de +@@ -256,6 +281,51 @@ static int aqr_config_aneg(struct phy_de return genphy_c45_check_and_restart_aneg(phydev, changed); } @@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean static int aqr_config_intr(struct phy_device *phydev) { bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; -@@ -738,6 +808,30 @@ static struct phy_driver aqr_driver[] = +@@ -751,6 +821,30 @@ static struct phy_driver aqr_driver[] = .get_stats = aqr107_get_stats, .link_change_notify = aqr107_link_change_notify, }, @@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean }; module_phy_driver(aqr_driver); -@@ -748,9 +842,11 @@ static struct mdio_device_id __maybe_unu +@@ -761,9 +855,11 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, diff --git a/target/linux/ipq807x/patches-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch b/target/linux/ipq807x/patches-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch index 9c5df905b..5ce07c9aa 100644 --- a/target/linux/ipq807x/patches-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch +++ b/target/linux/ipq807x/patches-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch @@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean --- a/drivers/net/phy/aquantia_main.c +++ b/drivers/net/phy/aquantia_main.c -@@ -301,10 +301,16 @@ static int aqr_config_aneg_set_prot(stru +@@ -314,10 +314,16 @@ static int aqr_config_aneg_set_prot(stru phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE, aquantia_syscfg[if_type].start_rate); diff --git a/target/linux/ipq807x/patches-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch b/target/linux/ipq807x/patches-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch index 7a661309f..5d7213957 100644 --- a/target/linux/ipq807x/patches-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch +++ b/target/linux/ipq807x/patches-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch @@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID #define PHY_ID_AQR113C 0x31c31c12 #define PHY_ID_AQCS109 0x03a1b5c2 #define PHY_ID_AQR405 0x03a1b4b0 -@@ -827,6 +828,14 @@ static struct phy_driver aqr_driver[] = +@@ -840,6 +841,14 @@ static struct phy_driver aqr_driver[] = .get_stats = aqr107_get_stats, }, { @@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID PHY_ID_MATCH_MODEL(PHY_ID_AQR412), .name = "Aquantia AQR412", .probe = aqr107_probe, -@@ -849,6 +858,7 @@ static struct mdio_device_id __maybe_unu +@@ -862,6 +871,7 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR112) }, diff --git a/target/linux/ipq807x/patches-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch b/target/linux/ipq807x/patches-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch index 40ad0ff58..a307a8f39 100644 --- a/target/linux/ipq807x/patches-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch +++ b/target/linux/ipq807x/patches-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch @@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle #define PHY_ID_AQR113 0x31c31c40 #define PHY_ID_AQR113C 0x31c31c12 #define PHY_ID_AQCS109 0x03a1b5c2 -@@ -828,6 +830,30 @@ static struct phy_driver aqr_driver[] = +@@ -841,6 +843,30 @@ static struct phy_driver aqr_driver[] = .get_stats = aqr107_get_stats, }, { @@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle PHY_ID_MATCH_MODEL(PHY_ID_AQR113), .name = "Aquantia AQR113", .config_aneg = aqr_config_aneg, -@@ -858,6 +884,8 @@ static struct mdio_device_id __maybe_unu +@@ -871,6 +897,8 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },