From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 26 Dec 2013 23:30:10 +0000 (+0000)
Subject: brcm47xx: fix cpu wait for BCM4706
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8c085f647b2ff582bee1c8bf730c53f052d91c4a;p=openwrt%2Fstaging%2Fflorian.git

brcm47xx: fix cpu wait for BCM4706

This was called to early.

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

SVN-Revision: 39167
---

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
- 
diff --git a/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch b/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
index 972cd07966..91d99025c5 100644
--- a/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
+++ b/target/linux/brcm47xx/patches-3.10/208-b44-use-fixed-PHY-device-if-we-do-not-find-any.patch
@@ -30,7 +30,7 @@ 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>
-@@ -239,6 +242,12 @@ void __init plat_mem_setup(void)
+@@ -230,6 +233,12 @@ void __init plat_mem_setup(void)
  	mips_set_machine_name(bcm47xx_board_get_name());
  }
  
@@ -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) {
-@@ -253,6 +262,7 @@ static int __init bcm47xx_register_bus_c
+@@ -252,6 +261,7 @@ static int __init bcm47xx_register_bus_c
  		break;
  #endif
  	}
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 c61254db02..2ea0917ff8 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
@@ -8,7 +8,7 @@
  #include <asm/bootinfo.h>
  #include <asm/prom.h>
  #include <asm/reboot.h>
-@@ -248,6 +249,33 @@ static struct fixed_phy_status bcm47xx_f
+@@ -239,6 +240,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) {
-@@ -263,6 +291,8 @@ static int __init bcm47xx_register_bus_c
+@@ -262,6 +290,8 @@ static int __init bcm47xx_register_bus_c
  #endif
  	}
  	fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);