From 906fdf39167ec5703232638015a6d3ff5f3cdb49 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 30 Apr 2008 10:59:03 +0000 Subject: sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10988 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.25/296-avila_mac_plat_info.patch | 58 +++++++++------------- 1 file changed, 24 insertions(+), 34 deletions(-) (limited to 'target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch') diff --git a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch index 8c142df130..0c18956e34 100644 --- a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch @@ -2,54 +2,44 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== --- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c +++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c -@@ -132,12 +132,42 @@ static struct platform_device avila_pata +@@ -132,6 +132,31 @@ static struct platform_device avila_pata .resource = avila_pata_resources, }; +/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info avila_plat_eth[] = { -+ { -+ .phy = 0, -+ .rxq = 3, -+ .txreadyq = 20, -+ }, { -+ .phy = 1, -+ .rxq = 4, -+ .txreadyq = 21, -+ } ++static struct eth_plat_info avila_npeb_data = { ++ .phy = 0, ++ .rxq = 3, ++ .txreadyq = 20, +}; + -+static struct platform_device avila_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = avila_plat_eth, -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = avila_plat_eth + 1, -+ } ++static struct eth_plat_info avila_npec_data = { ++ .phy = 1, ++ .rxq = 4, ++ .txreadyq = 21, ++}; ++ ++static struct platform_device avila_npeb_device = { ++ .name = "ixp4xx_eth", ++ .id = IXP4XX_ETH_NPEB, ++ .dev.platform_data = &avila_npeb_data, ++}; ++ ++static struct platform_device avila_npec_device = { ++ .name = "ixp4xx_eth", ++ .id = IXP4XX_ETH_NPEC, ++ .dev.platform_data = &avila_npec_data, +}; + static struct platform_device *avila_devices[] __initdata = { &avila_i2c_gpio, &avila_flash, - &avila_uart - }; - -+static struct platform_device *avila_eth_devices[] = { -+ &avila_eth[0], -+ &avila_eth[1] -+}; -+ - static void __init avila_init(void) - { - ixp4xx_sys_init(); -@@ -159,6 +189,7 @@ static void __init avila_init(void) +@@ -159,6 +184,8 @@ static void __init avila_init(void) platform_device_register(&avila_pata); -+ platform_add_devices(avila_eth_devices, ARRAY_SIZE(avila_eth_devices)); ++ platform_device_register(avila_npeb_device); ++ platform_device_register(avila_npec_device); } MACHINE_START(AVILA, "Gateworks Avila Network Platform") -- cgit v1.2.3