[PATCH v2 0/2] net/macb: merge at91_ether driver into macb driver

Boris Brezillon boris.brezillon at free-electrons.com
Thu Mar 5 22:13:57 PST 2015


The rm9200 boards use the dedicated at91_ether driver instead of the
regular macb driver.

Both the macb and at91_ether drivers can be compiled as separated
Since the at91_ether driver uses code from the macb driver, at91_ether.ko
depends on macb.ko.

However the macb.ko module always fails to load on rm9200 boards: the
macb_probe() function expects a hclk clock which doesn't exist on rm9200.
Then the at91_ether.ko can't be loaded in turn due to unresolved

This series of patches fix this issue by merging at91_ether into macb.

Best Rrgards,


Changes since v1:
- rework probe functions to share common probing logic

Cyrille Pitchen (2):
  net/macb: unify clock management
  net/macb: merge at91_ether driver into macb driver

 drivers/net/ethernet/cadence/Kconfig      |   8 -
 drivers/net/ethernet/cadence/Makefile     |   1 -
 drivers/net/ethernet/cadence/at91_ether.c | 481 ----------------------
 drivers/net/ethernet/cadence/macb.c       | 662 ++++++++++++++++++++++--------
 drivers/net/ethernet/cadence/macb.h       |  10 +-
 5 files changed, 494 insertions(+), 668 deletions(-)
 delete mode 100644 drivers/net/ethernet/cadence/at91_ether.c


More information about the linux-arm-kernel mailing list