X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7188c772bb19ef7ecd0deeae8db4a7e7f308a7ad..bdc7bbd91c1eff18494a135f156dfbb17a9f201e:/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 8c142df13..c1c584c61 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
@@ -1,55 +1,43 @@
-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
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -132,6 +132,31 @@
  	.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 @@
  
  	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")