Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5b2f338 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'lan743x-driver' 



Bryan Whitehead says:

====================
lan743x: Add new lan743x driver

Add new lan743x driver.

The lan743x from Microchip Technologies Inc,
is a PCIe to Gigabit Ethernet Controller.

Updates for V4:
Patch 1/2 - Applied community suggestions
	convert to using module_pci_driver

Updates for V3:
Patch 1/2 - Applied community suggestions
	removed initialization tracking flags.
	converted to 64 bit statistics.
	converted tx clean up tasklet to napi.

Updates for V2:
Patch 1/2 - Applied community suggestions
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1c02e377 e8cf7c27

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -9161,6 +9161,13 @@ F: drivers/net/dsa/microchip/* 
F:	include/linux/platform_data/microchip-ksz.h

F:	Documentation/devicetree/bindings/net/dsa/ksz.txt



MICROCHIP LAN743X ETHERNET DRIVER

M:	Bryan Whitehead <bryan.whitehead@microchip.com>

M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/microchip/lan743x_*



MICROCHIP USB251XB DRIVER

M:	Richard Leitner <richard.leitner@skidata.com>

L:	linux-usb@vger.kernel.org

drivers/net/ethernet/microchip/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -42,4 +42,14 @@ config ENCX24J600 
      To compile this driver as a module, choose M here. The module will be

      called encx24j600.



config LAN743X

	tristate "LAN743x support"

	depends on PCI

	select PHYLIB

	---help---

	  Support for the Microchip LAN743x PCI Express Gigabit Ethernet chip



	  To compile this driver as a module, choose M here. The module will be

	  called lan743x.



endif # NET_VENDOR_MICROCHIP

drivers/net/ethernet/microchip/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4,3 +4,6 @@ 


obj-$(CONFIG_ENC28J60) += enc28j60.o

obj-$(CONFIG_ENCX24J600) += encx24j600.o encx24j600-regmap.o

obj-$(CONFIG_LAN743X) += lan743x.o



lan743x-objs := lan743x_main.o