summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-05-30 17:04:44 -0700
committerDavid S. Miller <davem@davemloft.net>2015-05-30 17:04:44 -0700
commit5befa5e8ad804574520818da6faae9010e2e8590 (patch)
treee56eacf509736ddf675acea62f76ea485b5df603 /net/ipv4
parenta74eab639ec502eb744528ef7c271576d670aa7a (diff)
parent95e130af03b103138ae0d188ef012e5994fe970d (diff)
downloadtalos-obmc-linux-5befa5e8ad804574520818da6faae9010e2e8590.tar.gz
talos-obmc-linux-5befa5e8ad804574520818da6faae9010e2e8590.zip
Merge branch 'stmmac-IPQ806x'
Mathieu Olivari says: ==================== Add support for QCA IPQ806x Ethernet GMAC controller This patch set adds support for the integrated Ethernet GMAC controller on QCA IPQ806x SoC. This controller is based on a Gigabit Synopsys DesignWare IP, already supported in the stmmac driver located in drivers/net/ethernet/stmicro/stmmac. This change is done as a follow-up to the following thread: *http://www.spinics.net/lists/netdev/msg311265.html While previous attempt was creating a new driver to drive this controller, this new post leverages the existing stmmac driver by implementing the SoC specific glue to it. Aside from the pure stmmac glue layer, we have a couple of related patches: *IPQ806x NSS clock addition is cherry-picked and refreshed from the following thread: https://lkml.org/lkml/2014/8/6/390 *phy-handle and fixed-link support are also added in this change set so the driver can be fully functional on platforms using device-trees as well as ethernet switches. V2: *Fix MODULE_LICENSE to "Dual BSD/GPL" as the dwmac-ipq806x.c is using ISC license. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud