1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/stmicro/stmmac
Jakub Kicinski 833d22f2f9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in CAN on file rename.

Conflicts:
	drivers/net/can/m_can/tcan4x5x-core.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-01-08 13:28:00 -08:00
..
altr_tse_pcs.c
altr_tse_pcs.h
chain_mode.c net: stmmac: Add support to Ethtool get/set ring parameters 2020-09-16 15:22:52 -07:00
common.h net: stmmac: Enable EEE HW LPI timer with auto SW/HW switching 2020-10-30 09:59:26 -07:00
descs.h net: stmmac: Initial support for TBS 2020-01-13 18:31:48 -08:00
descs_com.h
dwmac-anarion.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
dwmac-dwc-qos-eth.c net: stmmac: dwc-qos: Change the dwc_eth_dwmac_data's .probe prototype 2020-11-11 15:15:02 -08:00
dwmac-generic.c
dwmac-imx.c net: stmmac: overwrite the dma_cap.addr64 according to HW design 2020-12-08 14:52:29 -08:00
dwmac-intel-plat.c net: stmmac: dwmac-intel-plat: fix error return code in intel_eth_plat_probe() 2020-11-16 15:32:30 -08:00
dwmac-intel.c stmmac: intel: Add PCI IDs for TGL-H platform 2020-12-23 12:12:26 -08:00
dwmac-intel.h net: stmmac: Enable SERDES power up/down sequence 2020-04-21 15:54:45 -07:00
dwmac-ipq806x.c net: ethernet: stmmac: Disable hardware multicast filter 2020-08-12 13:12:52 -07:00
dwmac-lpc18xx.c
dwmac-mediatek.c net-next: stmmac: mediatek: add more support for RMII 2019-12-17 13:48:30 -08:00
dwmac-meson.c
dwmac-meson8b.c net: stmmac: dwmac-meson8b: add support for the RGMII RX delay on G12A 2021-01-07 15:58:33 -08:00
dwmac-oxnas.c
dwmac-qcom-ethqos.c net: stmmac: fix num_por initialization 2020-05-14 12:48:15 -07:00
dwmac-rk.c drivers/net/ethernet: clean up mis-targeted comments 2020-09-25 16:29:00 -07:00
dwmac-socfpga.c net: stmmac: fix enabling socfpga's ptp_ref_clock 2020-04-18 15:02:18 -07:00
dwmac-sti.c net: of_get_phy_mode: Change API to solve int/unit warnings 2019-11-04 11:21:25 -08:00
dwmac-stm32.c net: ethernet: stmmac: simplify phy modes management for stm32 2020-05-01 15:17:32 -07:00
dwmac-sun8i.c net: stmmac: dwmac-sun8i: Balance syscon (de)initialization 2021-01-05 16:32:08 -08:00
dwmac-sunxi.c net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes 2020-04-16 13:47:53 -07:00
dwmac4.h net: stmmac: Enable EEE HW LPI timer with auto SW/HW switching 2020-10-30 09:59:26 -07:00
dwmac4_core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-11-27 18:25:27 -08:00
dwmac4_descs.c net: stmmac: set get_rx_header_len() as void for it didn't have any error code to return 2020-09-11 14:37:34 -07:00
dwmac4_descs.h net: stmmac: gmac4+: Add TBS support 2020-01-13 18:31:48 -08:00
dwmac4_dma.c net: stmmac: gmac4+: Add TBS support 2020-01-13 18:31:48 -08:00
dwmac4_dma.h net: stmmac: gmac4+: Add TBS support 2020-01-13 18:31:48 -08:00
dwmac4_lib.c net: stmmac: increase the timeout for dma reset 2020-12-08 14:52:29 -08:00
dwmac5.c net: stmmac: simplify the return dwmac5_rxp_disable() 2020-12-09 17:05:37 -08:00
dwmac5.h net: stmmac: Add option for VLAN filter fail queue enable 2020-09-25 16:48:33 -07:00
dwmac100.h
dwmac100_core.c
dwmac100_dma.c
dwmac1000.h
dwmac1000_core.c net: stmmac: dwmac1000: provide multicast filter fallback 2020-08-12 13:12:52 -07:00
dwmac1000_dma.c
dwmac_dma.h net: stmmac: Let TX and RX interrupts be independently enabled/disabled 2019-12-18 12:14:08 -08:00
dwmac_lib.c net: stmmac: dwmac_lib: enlarge dma reset timeout 2020-11-14 16:04:02 -08:00
dwxgmac2.h net: stmmac: xgmac: Add TBS support 2020-01-13 18:31:48 -08:00
dwxgmac2_core.c net: stmmac: xgmac: Fix VLAN register handling 2020-04-02 07:04:45 -07:00
dwxgmac2_descs.c net: stmmac: set get_rx_header_len() as void for it didn't have any error code to return 2020-09-11 14:37:34 -07:00
dwxgmac2_dma.c net: stmmac: xgmac: Add TBS support 2020-01-13 18:31:48 -08:00
dwxlgmac2.h net: stmmac: Add support for Enterprise MAC version 2020-03-17 21:37:25 -07:00
enh_desc.c
hwif.c net: stmmac: Add support for Enterprise MAC version 2020-03-17 21:37:25 -07:00
hwif.h net: stmmac: Enable EEE HW LPI timer with auto SW/HW switching 2020-10-30 09:59:26 -07:00
Kconfig net: pcs: Move XPCS into new PCS subdirectory 2020-08-27 06:55:50 -07:00
Makefile net: stmmac: Add dwmac-intel-plat for GBE driver 2020-08-26 15:52:30 -07:00
mmc.h
mmc_core.c net: stmmac: mmc: Add Frame Preemption counters on GMAC5+ cores 2019-12-18 12:17:11 -08:00
norm_desc.c
ring_mode.c net: stmmac: Add support to Ethtool get/set ring parameters 2020-09-16 15:22:52 -07:00
stmmac.h net: stmmac: Use hrtimer for TX coalescing 2020-11-24 08:47:44 -08:00
stmmac_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-10-05 18:40:01 -07:00
stmmac_hwtstamp.c net: stmmac: Fix sub-second increment 2020-04-18 15:02:18 -07:00
stmmac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-12-11 22:29:38 -08:00
stmmac_mdio.c net: stmmac: allow stmmac to probe for C45 PHY devices 2020-12-09 19:40:09 -08:00
stmmac_pci.c stmmac: intel: Fix clock handling on error and remove paths 2020-04-30 12:50:15 -07:00
stmmac_pcs.h
stmmac_platform.c net: stmmac: platform: use optional clk/reset get APIs 2020-11-13 16:31:52 -08:00
stmmac_platform.h
stmmac_ptp.c net: reject PTP periodic output requests with unsupported flags 2019-11-15 12:48:32 -08:00
stmmac_ptp.h
stmmac_selftests.c net: stmmac: Add support to Ethtool get/set ring parameters 2020-09-16 15:22:52 -07:00
stmmac_tc.c net: stmmac: simplify the return tc_delete_knode() 2020-12-10 12:58:55 -08:00