Merge branch 'devel-misc' into omap-for-linus

1 files changed, 14 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index ca4d521947ac..f8303f7bbe76 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -33,6 +33,7 @@
 #include <linux/i2c/twl.h>
 
 #include <mach/hardware.h>
+#include <mach/id.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -556,6 +557,9 @@ static struct platform_device omap_dm9000_dev = {
 
 static void __init omap_dm9000_init(void)
 {
+        unsigned char *eth_addr = omap_dm9000_platdata.dev_addr;
+        struct omap_die_id odi;
+
         if (gpio_request(OMAP_DM9000_GPIO_IRQ, "dm9000 irq") < 0) {
                 printk(KERN_ERR "Failed to request GPIO%d for dm9000 IRQ\n",
                         OMAP_DM9000_GPIO_IRQ);
@@ -563,6 +567,16 @@ static void __init omap_dm9000_init(void)
                 }
 
         gpio_direction_input(OMAP_DM9000_GPIO_IRQ);
+
+        /* init the mac address using DIE id */
+        omap_get_die_id(&odi);
+
+        eth_addr[0] = 0x02; /* locally administered */
+        eth_addr[1] = odi.id_1 & 0xff;
+        eth_addr[2] = (odi.id_0 & 0xff000000) >> 24;
+        eth_addr[3] = (odi.id_0 & 0x00ff0000) >> 16;
+        eth_addr[4] = (odi.id_0 & 0x0000ff00) >> 8;
+        eth_addr[5] = (odi.id_0 & 0x000000ff);
 }
 
 static struct platform_device *devkit8000_devices[] __initdata = {