diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-06 23:51:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-06 23:51:24 +0000 |
commit | ebf07787210deee29e3ad4f2308433866a853c20 (patch) | |
tree | 95dbee09e015f09478f9a01a319cb1aed75af16f /target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch | |
parent | 53a2c19c69d03bbdb81f1c27f9bc0b81b8da5ee4 (diff) | |
download | upstream-ebf07787210deee29e3ad4f2308433866a853c20.tar.gz upstream-ebf07787210deee29e3ad4f2308433866a853c20.tar.bz2 upstream-ebf07787210deee29e3ad4f2308433866a853c20.zip |
brcm47xx: update board detection patches
Add patches like they are currently in the mainline mips tree and add
some more pending patches for board detection.
* Now the board name is shown under machine in /proc/cpuinfo.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38308
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch | 16 |
1 files changed, 5 insertions, 11 deletions
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 19adf6ff10..5e8a2cb461 100644 --- 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 } |