aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-12-26 23:27:52 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-12-26 23:27:52 +0000
commit56273881683b469d30e4db0d01244ecb3939e44c (patch)
tree07ec939e396f89fd188d8f380e5b5c3ea409620d /target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
parentcbfb4a3594a465308391e132114dabee50bc2e76 (diff)
downloadmaster-187ad058-56273881683b469d30e4db0d01244ecb3939e44c.tar.gz
master-187ad058-56273881683b469d30e4db0d01244ecb3939e44c.tar.bz2
master-187ad058-56273881683b469d30e4db0d01244ecb3939e44c.zip
brcm47xx: b44: This updates the phylib patches to the version send upstream
This uses a fixed phy instead of a dummy one. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39166 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch12
1 files changed, 6 insertions, 6 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 ec3818981d..c61254db02 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,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;