fix up mac address setting on ixp4xx for devices that store this info in the RedBoot...

[openwrt.git] / 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 ffba2bb..792acc0 100644 (file)
--- 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,28 @@
-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.4/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
-@@ -276,6 +276,7 @@ static void __init avila_gw2345_setup(vo
+--- 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
+@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo

  
  static void __init avila_gw2347_setup(void)
  {
 +      avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
        platform_device_register(&avila_npeb_device);
  
  
  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;
-@@ -310,6 +311,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_gw2355_setup(vo

  
  static void __init avila_gw2357_setup(void)
  {
 +      avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
        platform_device_register(&avila_npeb_device);
  
  
  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.24.2/drivers/net/arm/ixp4xx_eth.c
+       avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
+Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c

 ===================================================================
 ===================================================================

---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
-@@ -347,6 +347,14 @@ static void phy_reset(struct net_device 
+--- 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 

                return;
        }
  
                return;
        }
  


@@ -37,11 +37,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
        /* restart auto negotiation */
        bmcr = mdio_read(dev, phy_id, MII_BMCR);
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
        /* restart auto negotiation */
        bmcr = mdio_read(dev, phy_id, MII_BMCR);
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);

-Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h

 ===================================================================
 ===================================================================

---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
-@@ -115,6 +115,8 @@ struct eth_plat_info {
+--- 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 {

        u8 txreadyq;
        u8 hwaddr[6];
        u32 phy_mask;
        u8 txreadyq;
        u8 hwaddr[6];
        u32 phy_mask;