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-pxa320.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-pxa320.c')
-rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 55b74a7a6151..8a742b779e05 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c | |||
@@ -38,8 +38,8 @@ | |||
38 | * Asix AX88796 Ethernet | 38 | * Asix AX88796 Ethernet |
39 | */ | 39 | */ |
40 | static struct ax_plat_data colibri_asix_platdata = { | 40 | static struct ax_plat_data colibri_asix_platdata = { |
41 | .flags = AXFLG_MAC_FROMDEV, | 41 | .flags = 0, /* defined later */ |
42 | .wordlength = 2 | 42 | .wordlength = 2, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static struct resource colibri_asix_resource[] = { | 45 | static struct resource colibri_asix_resource[] = { |
@@ -72,6 +72,7 @@ static mfp_cfg_t colibri_pxa320_eth_pin_config[] __initdata = { | |||
72 | 72 | ||
73 | static void __init colibri_pxa320_init_eth(void) | 73 | static void __init colibri_pxa320_init_eth(void) |
74 | { | 74 | { |
75 | colibri_pxa3xx_init_eth(&colibri_asix_platdata); | ||
75 | pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_eth_pin_config)); | 76 | pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_eth_pin_config)); |
76 | set_irq_type(gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), IRQ_TYPE_EDGE_FALLING); | 77 | set_irq_type(gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), IRQ_TYPE_EDGE_FALLING); |
77 | platform_device_register(&asix_device); | 78 | platform_device_register(&asix_device); |