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

From: Boris Brezillon
Date: Fri Mar 06 2015 - 05:48:55 EST


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.

This series depends on this one [1].

Best Regards,


Changes since v2:
- rebase after changed brought by [1]

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 | 660 ++++++++++++++++++++++--------
drivers/net/ethernet/cadence/macb.h | 10 +-
5 files changed, 493 insertions(+), 667 deletions(-)
delete mode 100644 drivers/net/ethernet/cadence/at91_ether.c


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/