From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 18 Sep 2013 14:36:03 +0000 (+0000)
Subject: brcm47xx: update the clock fixes for BCM5354
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6dd2e9ae2cdb882906bdb2f13546ba831d6b41b1;p=openwrt%2Fstaging%2Fdedeckeh.git

brcm47xx: update the clock fixes for BCM5354

This updates the patches for BCM5354 to the version send for upstream
Linux inclusion.

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

SVN-Revision: 38037
---

diff --git a/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch b/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch
new file mode 100644
index 0000000000..346e33530b
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch
@@ -0,0 +1,41 @@
+--- a/arch/mips/bcm47xx/time.c
++++ b/arch/mips/bcm47xx/time.c
+@@ -27,10 +27,14 @@
+ #include <linux/ssb/ssb.h>
+ #include <asm/time.h>
+ #include <bcm47xx.h>
++#include <bcm47xx_nvram.h>
+ 
+ void __init plat_time_init(void)
+ {
+ 	unsigned long hz = 0;
++	u16 chip_id = 0;
++	char buf[10];
++	int len;
+ 
+ 	/*
+ 	 * Use deterministic values for initial counter interrupt
+@@ -43,15 +47,23 @@ void __init plat_time_init(void)
+ #ifdef CONFIG_BCM47XX_SSB
+ 	case BCM47XX_BUS_TYPE_SSB:
+ 		hz = ssb_cpu_clock(&bcm47xx_bus.ssb.mipscore) / 2;
++		chip_id = bcm47xx_bus.ssb.chip_id;
+ 		break;
+ #endif
+ #ifdef CONFIG_BCM47XX_BCMA
+ 	case BCM47XX_BUS_TYPE_BCMA:
+ 		hz = bcma_cpu_clock(&bcm47xx_bus.bcma.bus.drv_mips) / 2;
++		chip_id = bcm47xx_bus.bcma.bus.chipinfo.id;
+ 		break;
+ #endif
+ 	}
+ 
++	if (chip_id == 0x5354) {
++		len = bcm47xx_nvram_getenv("clkfreq", buf, sizeof(buf));
++		if (len >= 0 && !strncmp(buf, "200", 4))
++			hz = 100000000;
++	}
++
+ 	if (!hz)
+ 		hz = 100000000;
+ 
diff --git a/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch b/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch
deleted file mode 100644
index ff670e87a9..0000000000
--- a/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
-@@ -27,10 +27,14 @@
- #include <linux/ssb/ssb.h>
- #include <asm/time.h>
- #include <bcm47xx.h>
-+#include <bcm47xx_nvram.h>
- 
- void __init plat_time_init(void)
- {
- 	unsigned long hz = 0;
-+	u16 chip_id = 0;
-+	char buf[10];
-+	int len;
- 
- 	/*
- 	 * Use deterministic values for initial counter interrupt
-@@ -43,15 +47,26 @@ void __init plat_time_init(void)
- #ifdef CONFIG_BCM47XX_SSB
- 	case BCM47XX_BUS_TYPE_SSB:
- 		hz = ssb_cpu_clock(&bcm47xx_bus.ssb.mipscore) / 2;
-+		chip_id = bcm47xx_bus.ssb.chip_id;
- 		break;
- #endif
- #ifdef CONFIG_BCM47XX_BCMA
- 	case BCM47XX_BUS_TYPE_BCMA:
- 		hz = bcma_cpu_clock(&bcm47xx_bus.bcma.bus.drv_mips) / 2;
-+		chip_id = bcm47xx_bus.bcma.bus.chipinfo.id;
- 		break;
- #endif
- 	}
- 
-+	if (chip_id == 0x5354) {
-+		len = bcm47xx_nvram_getenv("clkfreq", buf, sizeof(buf));
-+		if (len >= 0 && !strncmp(buf, "200", 4))
-+			hz = 100000000;
-+		len = bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf));
-+		if (len >= 0 && !strncmp(buf, "WL520G", 6))
-+			hz = 100000000;
-+
-+	}
- 	if (!hz)
- 		hz = 100000000;
- 
diff --git a/target/linux/brcm47xx/patches-3.10/521-MIPS-BCM47XX-fix-detected-clock-on-Asus-WL520GC-and-.patch b/target/linux/brcm47xx/patches-3.10/521-MIPS-BCM47XX-fix-detected-clock-on-Asus-WL520GC-and-.patch
new file mode 100644
index 0000000000..c4eb83593e
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/521-MIPS-BCM47XX-fix-detected-clock-on-Asus-WL520GC-and-.patch
@@ -0,0 +1,34 @@
+--- a/arch/mips/bcm47xx/time.c
++++ b/arch/mips/bcm47xx/time.c
+@@ -28,6 +28,7 @@
+ #include <asm/time.h>
+ #include <bcm47xx.h>
+ #include <bcm47xx_nvram.h>
++#include <bcm47xx_board.h>
+ 
+ void __init plat_time_init(void)
+ {
+@@ -35,6 +36,7 @@ void __init plat_time_init(void)
+ 	u16 chip_id = 0;
+ 	char buf[10];
+ 	int len;
++	enum bcm47xx_board board = bcm47xx_board_get();
+ 
+ 	/*
+ 	 * Use deterministic values for initial counter interrupt
+@@ -64,6 +66,15 @@ void __init plat_time_init(void)
+ 			hz = 100000000;
+ 	}
+ 
++	switch (board) {
++	case BCM47XX_BOARD_ASUS_WL520GC:
++	case BCM47XX_BOARD_ASUS_WL520GU:
++		hz = 100000000;
++		break;
++	default:
++		break;
++	}
++
+ 	if (!hz)
+ 		hz = 100000000;
+