Merge branch 'IXP46x-PTP-Timer'
Linus Walleij says:
====================
IXP46x PTP Timer clean-up and DT
ChangeLog v2->v3:
- Dropped the patch enabling compile tests: we are still dependent
on some machine-specific headers. The plan is to get rid of this
after device tree conversion. We include one of the compile testing
fixes anyway, because it is nice to have fixed.
- Rebased on the latest net-next
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/intel,ixp46x-ptp-timer.yaml 54 additions, 0 deletions...ation/devicetree/bindings/net/intel,ixp46x-ptp-timer.yaml
- arch/arm/mach-ixp4xx/common.c 14 additions, 0 deletionsarch/arm/mach-ixp4xx/common.c
- drivers/net/ethernet/xscale/Kconfig 2 additions, 2 deletionsdrivers/net/ethernet/xscale/Kconfig
- drivers/net/ethernet/xscale/Makefile 5 additions, 1 deletiondrivers/net/ethernet/xscale/Makefile
- drivers/net/ethernet/xscale/ixp46x_ts.h 11 additions, 2 deletionsdrivers/net/ethernet/xscale/ixp46x_ts.h
- drivers/net/ethernet/xscale/ixp4xx_eth.c 22 additions, 13 deletionsdrivers/net/ethernet/xscale/ixp4xx_eth.c
- drivers/net/ethernet/xscale/ptp_ixp46x.c 63 additions, 59 deletionsdrivers/net/ethernet/xscale/ptp_ixp46x.c
Loading
Please register or sign in to comment