X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0fc3447849ba0984e4892fe9cf0006852b65c12d..2748e1031df0c0e3e278d225e0ccc546d969a968:/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
index 3e5c3fe05..ece08fd17 100644
--- a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
@@ -1,28 +1,24 @@
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -294,6 +294,7 @@
  
  static void __init avila_gw2347_setup(void)
  {
 +	avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
  	platform_device_register(&avila_npeb_device);
  
- 	avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-@@ -281,6 +282,7 @@ static void __init avila_gw2355_setup(vo
+ 	avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
+@@ -338,6 +339,7 @@
  
  static void __init avila_gw2357_setup(void)
  {
 +	avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
  	platform_device_register(&avila_npeb_device);
  
- 	avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
-@@ -348,6 +348,14 @@ static void phy_reset(struct net_device 
+ 	avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
+@@ -348,6 +348,14 @@
  		return;
  	}
  
@@ -37,11 +33,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
  	/* restart auto negotiation */
  	bmcr = mdio_read(dev, phy_id, MII_BMCR);
  	bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
-Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
-@@ -104,6 +104,8 @@ struct eth_plat_info {
+--- a/include/asm-arm/arch-ixp4xx/platform.h
++++ b/include/asm-arm/arch-ixp4xx/platform.h
+@@ -104,6 +104,8 @@
  	u8 txreadyq;
  	u8 hwaddr[6];
  	u32 phy_mask;