aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6mr.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-07-09 18:10:48 -0400
committerDavid S. Miller <davem@davemloft.net>2016-07-09 18:10:48 -0400
commitdb9a1ba55a94b87d1ccbcdb74a35307f7a40aa9b (patch)
tree5e6036327a5751736c68e1cdc2324116268b7174 /net/ipv6/ip6mr.c
parentnet: tracepoint napi:napi_poll add work and budget (diff)
parentnet: ethernet: bgmac: Add platform device support (diff)
downloadlinux-dev-db9a1ba55a94b87d1ccbcdb74a35307f7a40aa9b.tar.xz
linux-dev-db9a1ba55a94b87d1ccbcdb74a35307f7a40aa9b.zip
Merge branch 'bgmac-platform-device'
Jon Mason says: ==================== net: ethernet: bgmac: Add platform device support David Miller, Please consider including patches 1-5 in net-next Florian Fainelli, Please consider including patches 6 & 7 in devicetree/next Changes in v2: * Made device tree binding changes suggested by Sergei Shtylyov, Ray Jui, Rob Herring, Florian Fainelli, and Arnd Bergmann * Removed devm_* error paths in the bgmac_platform.c suggested by Florian Fainelli * Added Arnd Bergmann's Acked-by to the first 5 (there were changes outlined in the bullets above, but I believe them to be minor enough for him to not revoke his acks) This patch series adds support for other, non-bcma iProc SoC's to the bgmac driver. This series only adds NSP support, but we are interested in adding support for the Cygnus and NS2 families (with more possible down the road). To support non-bcma enabled SoCs, we need to add the standard device tree "platform device" support. Unfortunately, this driver is very tighly coupled with the bcma bus and much unwinding is needed. I tried to break this up into a number of patches to make it more obvious what was being done to add platform device support. I was able to verify that the bcma code still works using a 53012K board (NS SoC), and that the platform code works using a 58625K board (NSP SoC). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
0 files changed, 0 insertions, 0 deletions