brcm47xx: b44: This updates the phylib patches to the version send upstream

[openwrt.git] / target / linux / brcm47xx / patches-3.10 / 830-huawei_e970_support.patch

diff --git a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
index ec3818981daf83b6d62094f4899e9e79e1847134..c61254db026d5b323695499eeae500d264350ab5 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
+++ b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -31,6 +31,7 @@
+@@ -34,6 +34,7 @@
  #include <linux/ssb/ssb.h>
  #include <linux/ssb/ssb_embedded.h>
  #include <linux/bcma/bcma_soc.h>
@@ -8,9 +8,9 @@
  #include <asm/bootinfo.h>
  #include <asm/prom.h>
  #include <asm/reboot.h>
-@@ -239,6 +240,33 @@ void __init plat_mem_setup(void)
-       mips_set_machine_name(bcm47xx_board_get_name());
- }
+@@ -248,6 +249,33 @@ static struct fixed_phy_status bcm47xx_f
+       .duplex = DUPLEX_FULL,
+ };
  
 +static struct gpio_wdt_platform_data gpio_wdt_data;
 +
@@ -42,10 +42,10 @@
  static int __init bcm47xx_register_bus_complete(void)
  {
        switch (bcm47xx_bus_type) {
-@@ -253,6 +281,8 @@ static int __init bcm47xx_register_bus_c
-               break;
+@@ -263,6 +291,8 @@ static int __init bcm47xx_register_bus_c
  #endif
        }
+       fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
 +      bcm47xx_register_gpio_watchdog();
 +
        return 0;