brcm47xx: update board detection patches

[openwrt/svn-archive/archive.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 19adf6ff10bc577e86bde86afffafcbff2700e62..5e8a2cb4619020fd5dffa433783821e477aff8f8 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,21 +1,15 @@
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -33,11 +33,13 @@
+@@ -33,6 +33,7 @@
  #include <linux/bcma/bcma_soc.h>
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
 +#include <linux/gpio_wdt.h>
  #include <asm/bootinfo.h>
+ #include <asm/prom.h>
  #include <asm/reboot.h>
- #include <asm/time.h>
- #include <bcm47xx.h>
- #include <bcm47xx_nvram.h>
-+#include <bcm47xx_board.h>
- 
- union bcm47xx_bus bcm47xx_bus;
- EXPORT_SYMBOL(bcm47xx_bus);
-@@ -255,6 +257,33 @@ void __init plat_mem_setup(void)
-       bcm47xx_board_detect();
+@@ -260,6 +261,33 @@ void __init plat_mem_setup(void)
+       mips_set_machine_name(bcm47xx_board_get_name());
  }
  
 +static struct gpio_wdt_platform_data gpio_wdt_data;
@@ -48,7 +42,7 @@
  static int __init bcm47xx_register_bus_complete(void)
  {
        switch (bcm47xx_bus_type) {
-@@ -269,6 +298,8 @@ static int __init bcm47xx_register_bus_c
+@@ -274,6 +302,8 @@ static int __init bcm47xx_register_bus_c
                break;
  #endif
        }