diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-03-24 03:32:21 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-03-24 03:32:21 +0300 |
| commit | ad6b67ffd2e8d53e5c306ce74b6f0d23b430df8a (patch) | |
| tree | 9dbd21f9b71d55cc9a17ee9f5cbe1ef2cee1b531 /include/linux | |
| parent | fb78a629b4f0eb399b413f6c093a3da177b3a4eb (diff) | |
| parent | 365c62c8b5307ae9f9f976e07bd6b606c54cfabc (diff) | |
| download | linux-ad6b67ffd2e8d53e5c306ce74b6f0d23b430df8a.tar.xz | |
Merge branch 'net-stmmac-improve-pcs-support'
Russell King says:
====================
net: stmmac: improve PCS support
This series is the next of the three part series sorting out the PCS
support in stmmac, building on part 2:
net: stmmac: qcom-ethqos: further serdes reorganisation
Similar patches have been posted previously. This series does away with
the common SerDes PHY support, instead using a flag to indicate whether
2500Mbps mode is supported (STMMAC_FLAG_SERDES_SUPPORTS_2500M.) At this
time, I have no plans to resurect the common SerDes PHY support - the
generic PHY layer implementations are just too random to consider that,
and I certainly do not want the extra work of fixing that.
The reasoning here is that these patches should be safe to merge and
should not impact qcom-ethqos in any way.
We can then figure out how to work around qcom-ethqos hacks without
having to keep re-posting these same patches time and time again.
====================
Link: https://patch.msgid.link/abrNYVfZ1Iwff2EI@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/stmmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 72febd246bdb..5b2bece81448 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -89,7 +89,6 @@ struct stmmac_mdio_bus_data { int *irqs; int probed_phy_irq; bool needs_reset; - bool default_an_inband; }; struct stmmac_dma_cfg { @@ -213,6 +212,7 @@ enum dwmac_core_type { #define STMMAC_FLAG_EN_TX_LPI_CLK_PHY_CAP BIT(12) #define STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY BIT(13) #define STMMAC_FLAG_KEEP_PREAMBLE_BEFORE_SFD BIT(14) +#define STMMAC_FLAG_SERDES_SUPPORTS_2500M BIT(15) struct mac_device_info; @@ -250,6 +250,7 @@ struct plat_stmmacenet_data { struct stmmac_dma_cfg *dma_cfg; struct stmmac_safety_feature_cfg *safety_feat_cfg; int clk_csr; + bool default_an_inband; bool enh_desc; bool tx_coe; bool bugged_jumbo; |