sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25
[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 296-avila_mac_plat_info.patch
1 Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
2 ===================================================================
3 --- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
4 +++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
5 @@ -132,6 +132,31 @@ static struct platform_device avila_pata
6         .resource               = avila_pata_resources,
7  };
8  
9 +/* Built-in 10/100 Ethernet MAC interfaces */
10 +static struct eth_plat_info avila_npeb_data = {
11 +       .phy            = 0,
12 +       .rxq            = 3,
13 +       .txreadyq       = 20,
14 +};
15 +
16 +static struct eth_plat_info avila_npec_data = {
17 +       .phy            = 1,
18 +       .rxq            = 4,
19 +       .txreadyq       = 21,
20 +};
21 +
22 +static struct platform_device avila_npeb_device = {
23 +       .name                   = "ixp4xx_eth",
24 +       .id                     = IXP4XX_ETH_NPEB,
25 +       .dev.platform_data      = &avila_npeb_data,
26 +};
27 +
28 +static struct platform_device avila_npec_device = {
29 +       .name                   = "ixp4xx_eth",
30 +       .id                     = IXP4XX_ETH_NPEC,
31 +       .dev.platform_data      = &avila_npec_data,
32 +};
33 +
34  static struct platform_device *avila_devices[] __initdata = {
35         &avila_i2c_gpio,
36         &avila_flash,
37 @@ -159,6 +184,8 @@ static void __init avila_init(void)
38  
39         platform_device_register(&avila_pata);
40  
41 +       platform_device_register(avila_npeb_device);
42 +       platform_device_register(avila_npec_device);
43  }
44  
45  MACHINE_START(AVILA, "Gateworks Avila Network Platform")