openwrt/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch

Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
@@ -14,10 +14,18 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/if_ether.h>
+#include <linux/socket.h>
+#include <linux/netdevice.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
+#ifdef CONFIG_SENSORS_EEPROM
+# include <linux/i2c.h>
+# include <linux/eeprom.h>
+#endif
+
 #include <linux/i2c-gpio.h>
 
 #include <asm/types.h>
@@ -194,9 +202,48 @@ static void __init avila_fixup(struct ma
     t->hdr.size = 0;
 }
 
+#ifdef CONFIG_SENSORS_EEPROM
+static int loft_eeprom_do(struct notifier_block *self, unsigned long event, void *t)
+{
+       struct eeprom_data *data = t;
+       struct sockaddr address;
+       struct net_device * netdev ;
+
+       char macs[12];
+
+       /* The MACs are the first 12 bytes in the eeprom at address 0x51 */
+       if (event == EEPROM_REGISTER && data->client.addr == 0x51) {
+               data->attr->read(&data->client.dev.kobj, data->attr, macs, 0, 12);
+		/*eth0*/
+		/* using dev_get_by_name here is really ugly and can cause
+ 		* confusion if other ethernet devices are present. FIXME */
+		
+		memcpy(address.sa_data, macs, ETH_ALEN);
+               	memcpy(&avila_plat_eth[0].hwaddr, macs, ETH_ALEN);
+		if ( (netdev = dev_get_by_name("eth0")) )
+			netdev->set_mac_address(netdev, &address);
+
+                /*same for eth1*/
+	 	memcpy(address.sa_data, macs + ETH_ALEN, ETH_ALEN);
+	       memcpy(&avila_plat_eth[1].hwaddr, macs + ETH_ALEN, ETH_ALEN);
+		if ( (netdev = dev_get_by_name("eth1")) )
+			netdev->set_mac_address(netdev, &address);
+       }
+
+       return NOTIFY_DONE;
+}
+
+static struct notifier_block loft_eeprom_notifier = {
+       .notifier_call = loft_eeprom_do
+};
+#endif
+
 static void __init avila_init(void)
 {
 	ixp4xx_sys_init();
+#ifdef CONFIG_SENSORS_EEPROM
+       register_eeprom_notifier(&loft_eeprom_notifier);
+#endif
 
 	avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
 	avila_flash_resource.end =