aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-12-26 23:30:10 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-12-26 23:30:10 +0000
commit8c085f647b2ff582bee1c8bf730c53f052d91c4a (patch)
treec4fcc884f01e1ec40b41a6ae79792d8e6cdca357 /target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
parent961d5b4453e785abd2b053977af54681d64b0b09 (diff)
downloadupstream-8c085f647b2ff582bee1c8bf730c53f052d91c4a.tar.gz
upstream-8c085f647b2ff582bee1c8bf730c53f052d91c4a.tar.bz2
upstream-8c085f647b2ff582bee1c8bf730c53f052d91c4a.zip
brcm47xx: fix cpu wait for BCM4706
This was called to early. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39167
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch29
1 files changed, 14 insertions, 15 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
index e25451bcdb..e22bfc96a2 100644
--- a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
+++ b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
@@ -8,19 +8,18 @@
#include <bcm47xx.h>
#include <bcm47xx_nvram.h>
#include <bcm47xx_board.h>
-@@ -199,6 +200,15 @@ static void __init bcm47xx_register_bcma
- panic("Failed to initialize BCMA bus (err %d)", err);
-
- bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
-+
-+ /* 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
-+ * does not have this problem.
-+ */
-+ if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
-+ cpu_wait = NULL;
- }
+@@ -239,6 +240,14 @@ static int __init bcm47xx_register_bus_c
+ #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
++ * 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
-