Fixes the MAC address handling on avila NPE on startup
[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 054-fsg3_mac_plat_info.patch
1 diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
2 index 11336e6..ec3d517 100644
3 --- a/arch/arm/mach-ixp4xx/fsg-setup.c
4 +++ b/arch/arm/mach-ixp4xx/fsg-setup.c
5 @@ -142,12 +142,39 @@ static struct platform_device fsg_uart = {
6         .resource               = fsg_uart_resources,
7  };
8  
9 +/* Built-in 10/100 Ethernet MAC interfaces */
10 +static struct eth_plat_info fsg_plat_eth[] = {
11 +        {
12 +                .phy            = 5,
13 +                .rxq            = 3,
14 +               .txreadyq       = 20,
15 +        }, {
16 +                .phy            = 4,
17 +                .rxq            = 4,
18 +               .txreadyq       = 21,
19 +        }
20 +};
21 +
22 +static struct platform_device fsg_eth[] = {
23 +        {
24 +                .name                   = "ixp4xx_eth",
25 +                .id                     = IXP4XX_ETH_NPEB,
26 +                .dev.platform_data      = fsg_plat_eth,
27 +        }, {
28 +                .name                   = "ixp4xx_eth",
29 +                .id                     = IXP4XX_ETH_NPEC,
30 +                .dev.platform_data      = fsg_plat_eth + 1,
31 +        }
32 +};
33 +
34  static struct platform_device *fsg_devices[] __initdata = {
35         &fsg_i2c_gpio,
36         &fsg_flash,
37  #ifdef CONFIG_LEDS_IXP4XX
38         &fsg_leds,
39  #endif
40 +       &fsg_eth[0],
41 +       &fsg_eth[1],
42  };
43  
44  static void __init fsg_init(void)