Skip to content

Commit

Permalink
net/at91_ether: add pdata flag for reverse Eth addr
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joachim Eastwood authored and David S. Miller committed Oct 23, 2012
1 parent f4a15e1 commit 0668744
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-at91/board-csb337.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ static void __init csb337_init_early(void)
static struct macb_platform_data __initdata csb337_eth_data = {
.phy_irq_pin = AT91_PIN_PC2,
.is_rmii = 0,
/* The CSB337 bootloader stores the MAC the wrong-way around */
.rev_eth_addr = 1,
};

static struct at91_usbh_data __initdata csb337_usbh_data = {
Expand Down
1 change: 0 additions & 1 deletion drivers/net/ethernet/cadence/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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---
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/ethernet/cadence/at91_ether.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions include/linux/platform_data/macb.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ struct macb_platform_data {
u32 phy_mask;
int phy_irq_pin; /* PHY IRQ */
u8 is_rmii; /* using RMII interface? */
u8 rev_eth_addr; /* reverse Ethernet address byte order */
};

#endif /* __MACB_PDATA_H__ */

0 comments on commit 0668744

Please sign in to comment.