KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm74xx: fix patch for BCM4706 CPUs

Browse source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 39250
This commit is contained in:
Hauke Mehrtens 2014-01-12 18:51:45 +00:00
parent e585841044
commit 7d654de038
3 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
View file

@ -1,3 +1,17 @@
From fb143ba7f7cd215bc2fc34a478c4c0b6dc56e537 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 6 Jan 2014 14:51:59 +0100
Subject: [PATCH] MIPS: BCM47XX: fix position of cpu_wait disabling
The disabling of cpu_wait was done too early, before the detection was
done. This moves the code to a position where it actually works.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
arch/mips/bcm47xx/setup.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -35,6 +35,7 @@
@ -8,18 +22,35 @@
#include <bcm47xx.h>
#include <bcm47xx_nvram.h>
#include <bcm47xx_board.h>
@@ -239,6 +240,14 @@ static int __init bcm47xx_register_bus_c
#endif
#ifdef CONFIG_BCM47XX_BCMA
case BCM47XX_BUS_TYPE_BCMA:
@@ -229,6 +230,31 @@ void __init plat_mem_setup(void)
mips_set_machine_name(bcm47xx_board_get_name());
}
+static int __init bcm47xx_cpu_fixes(void)
+{
+ switch (bcm47xx_bus_type) {
+#ifdef CONFIG_BCM47XX_SSB
+ case BCM47XX_BUS_TYPE_SSB:
+ /* Nothing to do */
+ break;
+#endif
+#ifdef CONFIG_BCM47XX_BCMA
+ case BCM47XX_BUS_TYPE_BCMA:
+ /* The BCM4706 has a problem with the CPU wait instruction.
+ * When r4k_wait or r4k_wait_irqoff is used will just hang and
+ * not return from a msleep(). Removing the cpu_wait
+ * functionality is a workaround for this problem. The BCM4716
+ * When r4k_wait or r4k_wait_irqoff is used will just hang and
+ * not return from a msleep(). Removing the cpu_wait
+ * functionality is a workaround for this problem. The BCM4716
+ * does not have this problem.
+ */
+ if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
+ cpu_wait = NULL;
bcma_bus_register(&bcm47xx_bus.bcma.bus);
break;
#endif
+ break;
+#endif
+ }
+ return 0;
+}
+arch_initcall(bcm47xx_cpu_fixes);
+
static int __init bcm47xx_register_bus_complete(void)
{
switch (bcm47xx_bus_type) {

6
target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
View file

@ -30,9 +30,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/ssb/ssb.h>
#include <linux/ssb/ssb_embedded.h>
#include <linux/bcma/bcma_soc.h>
@@ -230,6 +233,12 @@ void __init plat_mem_setup(void)
mips_set_machine_name(bcm47xx_board_get_name());
@@ -255,6 +258,12 @@ static int __init bcm47xx_cpu_fixes(void
}
arch_initcall(bcm47xx_cpu_fixes);
+static struct fixed_phy_status bcm47xx_fixed_phy_status __initdata = {
+ .link = 1,
@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int __init bcm47xx_register_bus_complete(void)
{
switch (bcm47xx_bus_type) {
@@ -252,6 +261,7 @@ static int __init bcm47xx_register_bus_c
@@ -269,6 +278,7 @@ static int __init bcm47xx_register_bus_c
break;
#endif
}

4
target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
View file

@ -8,7 +8,7 @@
#include <asm/bootinfo.h>
#include <asm/prom.h>
#include <asm/reboot.h>
@@ -239,6 +240,33 @@ static struct fixed_phy_status bcm47xx_f
@@ -264,6 +265,33 @@ static struct fixed_phy_status bcm47xx_f
.duplex = DUPLEX_FULL,
};
@ -42,7 +42,7 @@
static int __init bcm47xx_register_bus_complete(void)
{
switch (bcm47xx_bus_type) {
@@ -262,6 +290,8 @@ static int __init bcm47xx_register_bus_c
@@ -279,6 +307,8 @@ static int __init bcm47xx_register_bus_c
#endif
}
fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);