From d8da685340083211c0e7ea37d6750c3e8383552b Mon Sep 17 00:00:00 2001 From: "Alexandros C. Couloumbis" Date: Sun, 18 Jul 2010 19:24:00 +0000 Subject: ixp4xx: backport r21893 wrt300nv2 mac fix to 2.6.32 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22284 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.32/132-wrt300nv2_mac_fix.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch (limited to 'target') diff --git a/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch b/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch new file mode 100644 index 0000000000..cc891e2482 --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.32/132-wrt300nv2_mac_fix.patch @@ -0,0 +1,71 @@ +--- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +@@ -3,6 +3,7 @@ + * + * Board setup for the Linksys WRT300N v2 + * ++ * Copyright (C) 2010 Alexandros C. Couloumbis + * Copyright (C) 2007 Imre Kaloz + * + * based on coyote-setup.c: +@@ -18,6 +19,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -79,7 +81,8 @@ static struct platform_device wrt300nv2_ + /* Built-in 10/100 Ethernet MAC interfaces */ + static struct eth_plat_info wrt300nv2_plat_eth[] = { + { +- .phy = -1, ++ .phy = IXP4XX_ETH_PHY_MAX_ADDR, ++ .phy_mask = 0x0F0000, + .rxq = 3, + .txreadyq = 20, + }, { +@@ -111,6 +114,9 @@ static struct platform_device *wrt300nv2 + static void __init wrt300nv2_init(void) + { + ixp4xx_sys_init(); ++ uint8_t __iomem *f; ++ int offset = 0; ++ int i; + + wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); + wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; +@@ -119,6 +125,32 @@ static void __init wrt300nv2_init(void) + *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; + + platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices)); ++ ++ f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x60000); ++ ++ if (f) { ++ for (i = 0; i < 6; i++) { ++#ifdef __ARMEB__ ++ wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + i); ++ if (i == 5) ++ offset = 1; ++ wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset); ++#else ++ wrt300nv2_plat_eth[0].hwaddr[i] = readb(f + 0x5FFA0 + (i^3)); ++ if (i == 5) ++ offset = 1; ++ wrt300nv2_plat_eth[1].hwaddr[i] = (wrt300nv2_plat_eth[0].hwaddr[i] + offset); ++#endif ++ } ++ iounmap(f); ++ } ++ ++ if (!(is_valid_ether_addr(wrt300nv2_plat_eth[0].hwaddr))) ++ random_ether_addr(wrt300nv2_plat_eth[0].hwaddr); ++ if (!(is_valid_ether_addr(wrt300nv2_plat_eth[1].hwaddr))) { ++ memcpy(wrt300nv2_plat_eth[1].hwaddr, wrt300nv2_plat_eth[0].hwaddr, ETH_ALEN); ++ wrt300nv2_plat_eth[1].hwaddr[5] = (wrt300nv2_plat_eth[0].hwaddr[5] + 1); ++ } + } + + #ifdef CONFIG_MACH_WRT300NV2 -- cgit v1.2.3