diff options
| author | Joachim Eastwood <manabian@gmail.com> | 2012-10-22 08:45:34 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-23 02:40:10 -0400 |
| commit | 0668744f792a737872aa1904010e5fba5f95376b (patch) | |
| tree | ce489d58abb7a6a93e86a72dd524b3a26e7701b3 /drivers | |
| parent | f4a15e1b293b0de21bab6d9c258f162d9efff9e2 (diff) | |
net/at91_ether: add pdata flag for reverse Eth addr
This will allow us to remove the last mach include from at91_ether
and also make it easier to share address setup with macb.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/cadence/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/cadence/at91_ether.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index f6d0956485f..40172d1ca60 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig @@ -21,7 +21,6 @@ if NET_CADENCE config ARM_AT91_ETHER tristate "AT91RM9200 Ethernet support" - depends on ARM && ARCH_AT91RM9200 select NET_CORE select MACB ---help--- diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index 375d272d1a5..b92815aabc6 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c @@ -32,8 +32,6 @@ #include <linux/phy.h> #include <linux/io.h> -#include <asm/mach-types.h> - #include "macb.h" #define DRV_NAME "at91_ether" @@ -61,9 +59,10 @@ static short __init unpack_mac_address(struct net_device *dev, unsigned int hi, unsigned int lo) { + struct macb *lp = netdev_priv(dev); char addr[6]; - if (machine_is_csb337()) { + if (lp->board_data.rev_eth_addr) { addr[5] = (lo & 0xff); /* The CSB337 bootloader stores the MAC the wrong-way around */ addr[4] = (lo & 0xff00) >> 8; addr[3] = (lo & 0xff0000) >> 16; |