diff options
author | 2024-05-13 17:20:03 -0700 | |
---|---|---|
committer | 2024-05-13 17:20:03 -0700 | |
commit | 0621be48a8d598bc34fdb8bfd7179764aba627e6 (patch) | |
tree | aa641fb96914e72c5d0707a42253dee6e37098a9 /include | |
parent | net: qede: flower: validate control flags (diff) | |
parent | net: stmmac: add support for RZ/N1 GMAC (diff) | |
download | linux-0621be48a8d598bc34fdb8bfd7179764aba627e6.tar.gz linux-0621be48a8d598bc34fdb8bfd7179764aba627e6.tar.bz2 linux-0621be48a8d598bc34fdb8bfd7179764aba627e6.zip |
Merge branch 'net-stmmac-add-support-for-rzn1-gmac-devices'
Romain Gantois says:
====================
net: stmmac: Add support for RZN1 GMAC devices
This is version seven of my series that adds support for a Gigabit Ethernet
controller featured in the Renesas r9a06g032 SoC, of the RZ/N1 family. This
GMAC device is based on a Synopsys IP and is compatible with the stmmac driver.
My former colleague Clément Léger originally sent a series for this driver,
but an issue in bringing up the PCS clock had blocked the upstreaming
process. This issue has since been resolved by the following series:
https://lore.kernel.org/all/20240326-rxc_bugfix-v6-0-24a74e5c761f@bootlin.com/
This series consists of a devicetree binding describing the RZN1 GMAC
controller IP, a node for the GMAC1 device in the r9a06g032 SoC device
tree, and the GMAC driver itself which is a glue layer in stmmac.
There are also two patches by Russell that improve pcs initialization handling
in stmmac.
====================
Link: https://lore.kernel.org/r/20240513-rzn1-gmac1-v7-0-6acf58b5440d@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/stmmac.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index dfa1828cd756..4a24a246c617 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -285,6 +285,8 @@ struct plat_stmmacenet_data { int (*crosststamp)(ktime_t *device, struct system_counterval_t *system, void *ctx); void (*dump_debug_regs)(void *priv); + int (*pcs_init)(struct stmmac_priv *priv); + void (*pcs_exit)(struct stmmac_priv *priv); void *bsp_priv; struct clk *stmmac_clk; struct clk *pclk; |