| 1 | --- a/arch/arm/mach-ixp4xx/ap1000-setup.c |
| 2 | +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c |
| 3 | @@ -90,15 +90,43 @@ static struct platform_device ap1000_uar |
| 4 | .resource = ap1000_uart_resources |
| 5 | }; |
| 6 | |
| 7 | +/* Built-in 10/100 Ethernet MAC interfaces */ |
| 8 | +static struct eth_plat_info ap1000_plat_eth[] = { |
| 9 | + { |
| 10 | + .phy = IXP4XX_ETH_PHY_MAX_ADDR, |
| 11 | + .phy_mask = 0x1e, |
| 12 | + .rxq = 3, |
| 13 | + .txreadyq = 20, |
| 14 | + }, { |
| 15 | + .phy = 5, |
| 16 | + .rxq = 4, |
| 17 | + .txreadyq = 21, |
| 18 | + } |
| 19 | +}; |
| 20 | + |
| 21 | +static struct platform_device ap1000_eth[] = { |
| 22 | + { |
| 23 | + .name = "ixp4xx_eth", |
| 24 | + .id = IXP4XX_ETH_NPEB, |
| 25 | + .dev.platform_data = ap1000_plat_eth, |
| 26 | + }, { |
| 27 | + .name = "ixp4xx_eth", |
| 28 | + .id = IXP4XX_ETH_NPEC, |
| 29 | + .dev.platform_data = ap1000_plat_eth + 1, |
| 30 | + } |
| 31 | +}; |
| 32 | + |
| 33 | static struct platform_device *ap1000_devices[] __initdata = { |
| 34 | &ap1000_flash, |
| 35 | - &ap1000_uart |
| 36 | + &ap1000_uart, |
| 37 | + &ap1000_eth[0], |
| 38 | + &ap1000_eth[1], |
| 39 | }; |
| 40 | |
| 41 | static char ap1000_mem_fixup[] __initdata = "mem=64M "; |
| 42 | |
| 43 | -static void __init ap1000_fixup(struct machine_desc *desc, |
| 44 | - struct tag *tags, char **cmdline, struct meminfo *mi) |
| 45 | +static void __init ap1000_fixup(struct tag *tags, char **cmdline, |
| 46 | + struct meminfo *mi) |
| 47 | |
| 48 | { |
| 49 | struct tag *t = tags; |
| 50 | |
