use the newer mac handling patches from nslu2-linux
[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-2.6.23 / 067-nas100d_fetch_mac.patch
1 Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c
2 ===================================================================
3 --- linux-2.6.23.11-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-12-29 23:19:07.000000000 +1030
4 +++ linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-12-29 23:24:06.000000000 +1030
5 @@ -21,6 +21,7 @@
6 #include <asm/mach-types.h>
7 #include <asm/mach/arch.h>
8 #include <asm/mach/flash.h>
9 +#include <asm/io.h>
10
11 static struct flash_platform_data nas100d_flash_data = {
12 .map_name = "cfi_probe",
13 @@ -164,6 +165,9 @@
14
15 static void __init nas100d_init(void)
16 {
17 + uint8_t __iomem *f;
18 + int i;
19 +
20 ixp4xx_sys_init();
21
22 /* gpio 14 and 15 are _not_ clocks */
23 @@ -183,6 +187,33 @@
24 (void)platform_device_register(&nas100d_uart);
25
26 platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
27 +
28 +
29 + /*
30 + * Map in a portion of the flash and read the MAC address.
31 + * Since it is stored in BE in the flash itself, we need to
32 + * byteswap it if we're in LE mode.
33 + */
34 + if ((f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000))) {
35 +#ifdef __ARMEB__
36 + for (i = 0; i < 6; i++) {
37 + nas100d_plat_eth[0].hwaddr[i] = readb(f + 0xFC0FD8 + i);
38 + }
39 +#else
40 + nas100d_plat_eth[0].hwaddr[0] = readb(f + 0xFC0FD8 + 3);
41 + nas100d_plat_eth[0].hwaddr[1] = readb(f + 0xFC0FD8 + 2);
42 + nas100d_plat_eth[0].hwaddr[2] = readb(f + 0xFC0FD8 + 1);
43 + nas100d_plat_eth[0].hwaddr[3] = readb(f + 0xFC0FD8 + 0);
44 + nas100d_plat_eth[0].hwaddr[4] = readb(f + 0xFC0FD8 + 7);
45 + nas100d_plat_eth[0].hwaddr[5] = readb(f + 0xFC0FD8 + 6);
46 +#endif
47 + iounmap(f);
48 + }
49 + printk(KERN_INFO "NAS100D: Using MAC address %.2x:%.2x:%.2x:%.2x:%.2x:%.2x for port 0\n",
50 + nas100d_plat_eth[0].hwaddr[0], nas100d_plat_eth[0].hwaddr[1],
51 + nas100d_plat_eth[0].hwaddr[2], nas100d_plat_eth[0].hwaddr[3],
52 + nas100d_plat_eth[0].hwaddr[4], nas100d_plat_eth[0].hwaddr[5]);
53 +
54 }
55
56 MACHINE_START(NAS100D, "Iomega NAS 100d")