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

Merge branch 'systemport' 



Florian Fainelli says:

====================
net: Broadcom SYSTEMPORT driver

This patchset adds support for the Broadcom SYSTEMPORT Ethernet MAC
controller which is used in the latest Broadcom BCM7xxx Set Top Box
System-on-a-Chip. This Ethernet MAC is interfaced to an internal
switch which will get a separate driver submitted later on.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 23193668 b8302205

Documentation/devicetree/bindings/net/broadcom-systemport.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
* Broadcom BCM7xxx Ethernet Systemport Controller (SYSTEMPORT)



Required properties:

- compatible: should be one of "brcm,systemport-v1.00" or "brcm,systemport"

- reg: address and length of the register set for the device.

- interrupts: interrupts for the device, first cell must be for the the rx

  interrupts, and the second cell should be for the transmit queues

- local-mac-address: Ethernet MAC address (48 bits) of this adapter

- phy-mode: Should be a string describing the PHY interface to the

  Ethernet switch/PHY, see Documentation/devicetree/bindings/net/ethernet.txt

- fixed-link: see Documentation/devicetree/bindings/net/fsl-tsec-phy.txt for

  the property specific details



Optional properties:

- systemport,num-tier2-arb: number of tier 2 arbiters, an integer

- systemport,num-tier1-arb: number of tier 1 arbiters, an integer

- systemport,num-txq: number of HW transmit queues, an integer

- systemport,num-rxq: number of HW receive queues, an integer



Example:

ethernet@f04a0000 {

	compatible = "brcm,systemport-v1.00";

	reg = <0xf04a0000 0x4650>;

	local-mac-address = [ 00 11 22 33 44 55 ];

	fixed-link = <0 1 1000 0 0>;

	phy-mode = "gmii";

	interrupts = <0x0 0x16 0x0>,

		<0x0 0x17 0x0>;

};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1967,6 +1967,12 @@ S: Maintained 
F:	drivers/bcma/

F:	include/linux/bcma/



BROADCOM SYSTEMPORT ETHERNET DRIVER

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/broadcom/bcmsysport.*



BROCADE BFA FC SCSI DRIVER

M:	Anil Gurumurthy <anil.gurumurthy@qlogic.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>

drivers/net/ethernet/broadcom/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -150,4 +150,15 @@ config BGMAC 
	  In case of using this driver on BCM4706 it's also requires to enable

	  BCMA_DRIVER_GMAC_CMN to make it work.



config SYSTEMPORT

	tristate "Broadcom SYSTEMPORT internal MAC support"

	depends on OF

	select MII

	select PHYLIB

	select FIXED_PHY if SYSTEMPORT=y

	help

	  This driver supports the built-in Ethernet MACs found in the

	  Broadcom BCM7xxx Set Top Box family chipset using an internal

	  Ethernet switch.



endif # NET_VENDOR_BROADCOM

drivers/net/ethernet/broadcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ obj-$(CONFIG_BNX2X) += bnx2x/ 
obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o

obj-$(CONFIG_TIGON3) += tg3.o

obj-$(CONFIG_BGMAC) += bgmac.o

obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o

drivers/net/ethernet/broadcom/bcmsysport.c

0 → 100644
+1614 −0

File added.

Preview size limit exceeded, changes collapsed.