diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-04-02 02:33:14 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-04-03 22:26:34 -0400 |
commit | 22a0200b18b8526043d3014efdaf839b01767111 (patch) | |
tree | 5438a411a8382ae10a6ed99577ad65d54bed660e /arch/arm/mach-pxa/colibri-pxa3xx.c | |
parent | 50f6bb0ab75794ad02cb5db503cc8c99465ceaf4 (diff) |
[ARM] pxa/colibri: provide MAC address from ATAG_SERIAL
In 67fca028f1535e510689d2e444b0289e264e05c1, the ax88796 ethernet driver
learned a way to let the platform data hand in the MAC address. Use it
here as the original Colibri bootloader passes in a MAC address via
ATAG_SERIAL.
Reported-by: Matthias Meier <matthias.j.meier@gmx.net>
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa3xx.c')
-rw-r--r-- | arch/arm/mach-pxa/colibri-pxa3xx.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c index 12d0afc54aa5..ea34e34f8cd8 100644 --- a/arch/arm/mach-pxa/colibri-pxa3xx.c +++ b/arch/arm/mach-pxa/colibri-pxa3xx.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
17 | #include <linux/etherdevice.h> | ||
17 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
18 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
19 | #include <asm/sizes.h> | 20 | #include <asm/sizes.h> |
@@ -28,6 +29,40 @@ | |||
28 | #include "generic.h" | 29 | #include "generic.h" |
29 | #include "devices.h" | 30 | #include "devices.h" |
30 | 31 | ||
32 | #if defined(CONFIG_AX88796) | ||
33 | #define ETHER_ADDR_LEN 6 | ||
34 | static u8 ether_mac_addr[ETHER_ADDR_LEN]; | ||
35 | |||
36 | void __init colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data) | ||
37 | { | ||
38 | int i; | ||
39 | u64 serial = ((u64) system_serial_high << 32) | system_serial_low; | ||
40 | |||
41 | /* | ||
42 | * If the bootloader passed in a serial boot tag, which contains a | ||
43 | * valid ethernet MAC, pass it to the interface. Toradex ships the | ||
44 | * modules with their own bootloader which provides a valid MAC | ||
45 | * this way. | ||
46 | */ | ||
47 | |||
48 | for (i = 0; i < ETHER_ADDR_LEN; i++) { | ||
49 | ether_mac_addr[i] = serial & 0xff; | ||
50 | serial >>= 8; | ||
51 | } | ||
52 | |||
53 | if (is_valid_ether_addr(ether_mac_addr)) { | ||
54 | plat_data->flags |= AXFLG_MAC_FROMPLATFORM; | ||
55 | plat_data->mac_addr = ether_mac_addr; | ||
56 | printk(KERN_INFO "%s(): taking MAC from serial boot tag\n", | ||
57 | __func__); | ||
58 | } else { | ||
59 | plat_data->flags |= AXFLG_MAC_FROMDEV; | ||
60 | printk(KERN_INFO "%s(): no valid serial boot tag found, " | ||
61 | "taking MAC from device\n", __func__); | ||
62 | } | ||
63 | } | ||
64 | #endif | ||
65 | |||
31 | #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) | 66 | #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) |
32 | static int mmc_detect_pin; | 67 | static int mmc_detect_pin; |
33 | 68 | ||