diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-09 14:54:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-09 14:54:30 -0500 |
| commit | 3b647be2bfcd95d6d0feba245ccc3966c73ccc52 (patch) | |
| tree | 49c260adb1506a7d754b0154bc03460347edf33d /include | |
| parent | 3a7f75e532420edb375b8d0a1526c3c1b777c1f6 (diff) | |
| parent | d8256121a91a653682070092b9f105d0c45bd48b (diff) | |
| download | kernel_replicant_linux-3b647be2bfcd95d6d0feba245ccc3966c73ccc52.tar.gz kernel_replicant_linux-3b647be2bfcd95d6d0feba245ccc3966c73ccc52.tar.bz2 kernel_replicant_linux-3b647be2bfcd95d6d0feba245ccc3966c73ccc52.zip | |
Merge branch 'dwmac-dwc-qos-eth'
Joao Pinto says:
====================
adding new glue driver dwmac-dwc-qos-eth
This patch set contains the porting of the synopsys/dwc_eth_qos.c driver
to the stmmac structure. This operation resulted in the creation of a new
platform glue driver called dwmac-dwc-qos-eth which was based in the
dwc_eth_qos as is.
dwmac-dwc-qos-eth inherited dwc_eth_qos DT bindings, to assure that current
and old users can continue to use it as before. We can see this driver as
being deprecated, since all new development will be done in stmmac.
Please check each patch for implementation details.
====================
Tested-by: Niklas Cassel <niklas.cassel@axis.com>
Reviewed-by: Lars Persson <larper@axis.com>
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/stmmac.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 889e0e9a3f1c..d76033d6726d 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -138,9 +138,15 @@ struct plat_stmmacenet_data { int (*init)(struct platform_device *pdev, void *priv); void (*exit)(struct platform_device *pdev, void *priv); void *bsp_priv; + struct clk *stmmac_clk; + struct clk *pclk; + struct clk *clk_ptp_ref; + unsigned int clk_ptp_rate; + struct reset_control *stmmac_rst; struct stmmac_axi *axi; int has_gmac4; bool tso_en; int mac_port_sel_speed; + bool en_tx_lpi_clockgating; }; #endif |