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

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

Merge branch 'xgene-v2' 



Iyappan Subramanian says:

====================
drivers: net: xgene-v2: Add RGMII based 1G driver

This patch set adds support for RGMII based 1GbE hardware which uses a linked
list of DMA descriptor architecture (v2) for APM X-Gene SoCs.

v4: Address review comments from v3
	- fixed local variable declarations to reverse christmas tree order

v3: Address review comments from v2
	- fixed kbuild warnings (this 'if' clause does not guard)

v2: Address review comments from v1
	- moved create_desc_ring and delete_desc_ring to open() and close()
	  respectively
	- changed to use dma_zalloc APIs
	- fixed tx_timeout()
	- removed tx completion polling upper bound
	- added error checking on rx packets
	- added netif_stop_queue() and netif_wake_queue()

v1:
	- Initial version
====================

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 35ae57ea 70dbd9b2

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -902,6 +902,12 @@ F: drivers/net/phy/mdio-xgene.c 
F:	Documentation/devicetree/bindings/net/apm-xgene-enet.txt

F:	Documentation/devicetree/bindings/net/apm-xgene-mdio.txt



APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene-v2/



APPLIED MICRO (APM) X-GENE SOC PMU

M:	Tai Nguyen <ttnguyen@apm.com>

S:	Supported

drivers/net/ethernet/apm/Kconfig

+1 −0
Original line number Diff line number Diff line 
source "drivers/net/ethernet/apm/xgene/Kconfig"

source "drivers/net/ethernet/apm/xgene-v2/Kconfig"

drivers/net/ethernet/apm/Makefile

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



obj-$(CONFIG_NET_XGENE) += xgene/

obj-$(CONFIG_NET_XGENE_V2) += xgene-v2/

drivers/net/ethernet/apm/xgene-v2/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
config NET_XGENE_V2

	tristate "APM X-Gene SoC Ethernet-v2 Driver"

	depends on HAS_DMA

	depends on ARCH_XGENE || COMPILE_TEST

	help

	  This is the Ethernet driver for the on-chip ethernet interface

	  which uses a linked list of DMA descriptor architecture (v2) for

	  APM X-Gene SoCs.



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

	  be called xgene-enet-v2.

drivers/net/ethernet/apm/xgene-v2/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#

# Makefile for APM X-Gene Ethernet v2 driver

#



xgene-enet-v2-objs := main.o mac.o enet.o ring.o

obj-$(CONFIG_NET_XGENE_V2) += xgene-enet-v2.o