diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-08-27 23:07:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-27 23:07:18 -0700 |
| commit | 0ce4866f1e4697d45011bd1a01f33036660abffc (patch) | |
| tree | 899ead67da7a4a5c5d5eecf7940802e15c7b4a96 /drivers/net/dsa/Makefile | |
| parent | sungem: Fix global namespace pollution of phy accessors. (diff) | |
| parent | Documentation: devicetree: add Broadcom Starfighter 2 binding (diff) | |
| download | linux-dev-0ce4866f1e4697d45011bd1a01f33036660abffc.tar.xz linux-dev-0ce4866f1e4697d45011bd1a01f33036660abffc.zip | |
Merge branch 'sf2'
Florian Fainelli says:
====================
dsa: Broadcom Starfighter 2 switch support
This patch series adds support for the Broadcom Starfighter 2 (Roboswitch
successor) using the existing DSA infrastructure. This integrated switch
is heavily used in Set Top Box, Cable gateways and DSL gateways products
from Broadcom, and to a larger extent the new ARM-based Wi-Fi routers although
slightly differently.
Changes in v5 are the introduction of ETH_P_XDSA as suggested by Alexander to
help capture applications see this is a multiplexed DSA approach now.
Changes in v4 are the introducing of an indirection level for DSA switch tag
protocols receive and transmit functions.
I intentionnaly did not address one comment from Alexander who suggested to
move port_names and port_dn in a separate structure since that involves
touching arch/arm/ and arch/blackfin/ code which I am not yet comfortable
doing.
Notable changes in v3 is the preliminary patch that reworks the skb->protocol
override helpers for non-Ethertype switch tags, based on feedback from
Alexander Duyck.
The biggest changes from v1 of this patch series are:
- use the new fixed PHY helpers
- improved the switch driver with more complete features (interrupts,
(RG)MII configuration, memory arrays power down/up, port disabling/enable
VLAN separation
Future work will focus on bringing the upstream driver in feature parity with
the current downstream driver, including:
- adding Wake-on-LAN support to the switch
- adding suspend/resume callbacks for S2/S3 Power Management modes
- extending the switch register interface to cover BCM5310X SoCs
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/Makefile')
| -rw-r--r-- | drivers/net/dsa/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index f3bda05536cc..dd3cd3b8157f 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -7,3 +7,4 @@ endif ifdef CONFIG_NET_DSA_MV88E6131 mv88e6xxx_drv-y += mv88e6131.o endif +obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm_sf2.o |