linux/drivers/net/ethernet/stmicro/stmmac
David S. Miller e0ada51db9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simple overlapping changes in microchip
driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-04-21 16:32:48 -04:00
..
altr_tse_pcs.c net: ethernet: stmmac: Convert timers to use timer_setup() 2017-10-18 12:39:37 +01:00
altr_tse_pcs.h
chain_mode.c net: stmmac: Switch stmmac_mode_ops to generic HW Interface Helpers 2018-04-16 18:50:03 -04:00
common.h net: stmmac: Switch stmmac_mode_ops to generic HW Interface Helpers 2018-04-16 18:50:03 -04:00
descs_com.h
descs.h
dwmac4_core.c net: stmmac: Disable ACS Feature for GMAC >= 4 2018-04-19 13:33:44 -04:00
dwmac4_descs.c net: stmmac: Switch stmmac_desc_ops to generic HW Interface Helpers 2018-04-16 18:49:26 -04:00
dwmac4_descs.h
dwmac4_dma.c net: stmmac: Add support for DWMAC5 and implement Safety Features 2018-03-30 12:32:00 -04:00
dwmac4_dma.h
dwmac4_lib.c
dwmac4.h net: stmmac: Disable ACS Feature for GMAC >= 4 2018-04-19 13:33:44 -04:00
dwmac5.c net: stmmac: Switch stmmac_ops to generic HW Interface Helpers 2018-04-16 18:49:47 -04:00
dwmac5.h net: stmmac: Switch stmmac_ops to generic HW Interface Helpers 2018-04-16 18:49:47 -04:00
dwmac100_core.c net: stmmac: Fix reception of Broadcom switches tags 2018-01-22 16:12:11 -05:00
dwmac100_dma.c net: stmmac: Adjust dump offset of DMA registers for ethtool 2017-07-24 16:19:10 -07:00
dwmac100.h
dwmac1000_core.c net: stmmac: remove redundant enable of PMT irq 2018-02-09 14:23:04 -05:00
dwmac1000_dma.c net: stmmac: Adjust dump offset of DMA registers for ethtool 2017-07-24 16:19:10 -07:00
dwmac1000.h
dwmac_dma.h net: stmmac: Adjust dump offset of DMA registers for ethtool 2017-07-24 16:19:10 -07:00
dwmac_lib.c net: stmmac: dwmac_lib: fix interchanged sleep/timeout values in DMA reset function 2017-10-13 10:19:52 -07:00
dwmac-anarion.c net: stmmac: Add Adaptrum Anarion GMAC glue layer 2017-08-06 21:31:32 -07:00
dwmac-dwc-qos-eth.c net: stmmac: dwc-qos-eth: Fix typo in DT bindings parsing 2017-10-27 23:23:19 +09:00
dwmac-generic.c
dwmac-ipq806x.c net: ethernet: stmmac: Clean up dead code 2017-10-08 21:19:07 -07:00
dwmac-lpc18xx.c
dwmac-meson8b.c net: stmmac: dwmac-meson8b: Add support for the Meson8m2 SoC 2018-03-31 22:17:24 -04:00
dwmac-meson.c
dwmac-oxnas.c
dwmac-rk.c net: stmmac: dwmac-rk: Add RK3128 GMAC support 2017-10-03 15:39:56 -07:00
dwmac-socfpga.c net: stmmac: socfgpa: Ensure emac bit set in sys manager for MII/GMII/SGMII. 2017-08-23 20:26:58 -07:00
dwmac-sti.c
dwmac-stm32.c ethernet: dwmac-stm32: Fix copyright 2017-11-29 10:08:09 -05:00
dwmac-sun8i.c net: stmmac: Fix reception of Broadcom switches tags 2018-01-22 16:12:11 -05:00
dwmac-sunxi.c
enh_desc.c net: stmmac: Switch stmmac_desc_ops to generic HW Interface Helpers 2018-04-16 18:49:26 -04:00
hwif.h net: stmmac: Switch stmmac_mode_ops to generic HW Interface Helpers 2018-04-16 18:50:03 -04:00
Kconfig net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs 2017-10-27 11:58:49 +09:00
Makefile net: stmmac: Add support for DWMAC5 and implement Safety Features 2018-03-30 12:32:00 -04:00
mmc_core.c
mmc.h
norm_desc.c net: stmmac: Switch stmmac_desc_ops to generic HW Interface Helpers 2018-04-16 18:49:26 -04:00
ring_mode.c net: stmmac: Switch stmmac_mode_ops to generic HW Interface Helpers 2018-04-16 18:50:03 -04:00
stmmac_ethtool.c net: stmmac: Switch stmmac_ops to generic HW Interface Helpers 2018-04-16 18:49:47 -04:00
stmmac_hwtstamp.c net: stmmac: Switch stmmac_hwtimestamp to generic HW Interface Helpers 2018-04-16 18:49:55 -04:00
stmmac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-04-21 16:32:48 -04:00
stmmac_mdio.c net: stmmac: Delete dead code for MDIO registration 2017-09-05 14:36:18 -07:00
stmmac_pci.c stmmac: pci: Use dmi_system_id table for retrieving PHY addresses 2017-06-22 13:39:57 -04:00
stmmac_pcs.h
stmmac_platform.c net: stmmac: honor error code from stmmac_dt_phy() 2018-02-20 14:13:22 -05:00
stmmac_platform.h
stmmac_ptp.c net: stmmac: Switch stmmac_hwtimestamp to generic HW Interface Helpers 2018-04-16 18:49:55 -04:00
stmmac_ptp.h stmmac: fix ptp header for GMAC3 hw timestamp 2017-06-09 12:39:25 -04:00
stmmac.h net: stmmac: Add support for DWMAC5 and implement Safety Features 2018-03-30 12:32:00 -04:00