This is a patch series which jams together Arnds and mine cleanups for the IXP4xx networking.
I also have patches for device tree support but that requires more elaborate work, this series is some of mine and some of Arnds patches that is a good foundation for his multiplatform work and my device tree work. These are for application to the networking tree so that can be taken in one separate sweep. I have tested the patches for a bit using zeroday builds and some boots on misc IXP4xx devices and haven't run into any major problems. We might find some new stuff as a result from the new compiler coverage. The patch set also hits in the ARM tree but Arnd is a ARM SoC maintainer and is hereby informed :) Arnd Bergmann (4): wan: ixp4xx_hss: fix compile-testing on 64-bit wan: ixp4xx_hss: enable compile testing ptp: ixp46x: move next to ethernet driver ixp4xx_eth: move platform_data definition Linus Walleij (6): net: ethernet: ixp4xx: Standard module init net: ethernet: ixp4xx: Use distinct local variable net: ehernet: ixp4xx: Use devm_alloc_etherdev() ARM/net: ixp4xx: Pass ethernet physical base as resource net: ethernet: ixp4xx: Get port ID from base address net: ethernet: ixp4xx: Use parent dev for DMA pool arch/arm/mach-ixp4xx/fsg-setup.c | 20 ++ arch/arm/mach-ixp4xx/goramo_mlr.c | 24 +++ arch/arm/mach-ixp4xx/include/mach/platform.h | 22 +-- arch/arm/mach-ixp4xx/ixdp425-setup.c | 20 ++ arch/arm/mach-ixp4xx/nas100d-setup.c | 10 + arch/arm/mach-ixp4xx/nslu2-setup.c | 10 + arch/arm/mach-ixp4xx/omixp-setup.c | 20 ++ arch/arm/mach-ixp4xx/vulcan-setup.c | 20 ++ drivers/net/ethernet/xscale/Kconfig | 14 ++ drivers/net/ethernet/xscale/Makefile | 3 +- .../net/ethernet/xscale}/ixp46x_ts.h | 0 drivers/net/ethernet/xscale/ixp4xx_eth.c | 177 +++++++++--------- .../{ptp => net/ethernet/xscale}/ptp_ixp46x.c | 3 +- drivers/net/wan/Kconfig | 3 +- drivers/net/wan/ixp4xx_hss.c | 39 ++-- drivers/ptp/Kconfig | 14 -- drivers/ptp/Makefile | 1 - include/linux/platform_data/eth_ixp4xx.h | 19 ++ include/linux/platform_data/wan_ixp4xx_hss.h | 17 ++ 19 files changed, 292 insertions(+), 144 deletions(-) rename {arch/arm/mach-ixp4xx/include/mach => drivers/net/ethernet/xscale}/ixp46x_ts.h (100%) rename drivers/{ptp => net/ethernet/xscale}/ptp_ixp46x.c (99%) create mode 100644 include/linux/platform_data/eth_ixp4xx.h create mode 100644 include/linux/platform_data/wan_ixp4xx_hss.h -- 2.21.0