aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-11-25 16:38:16 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-11-25 16:38:16 +0000
commit8cb000c62fc7c6d478946ff36a666267df9ae60d (patch)
treedd41fdbfa3ad5639067c6e8df7381737ae26fa7a
parent7769b76a026e8bd3156aeac2bf90cd17d2886861 (diff)
downloadupstream-8cb000c62fc7c6d478946ff36a666267df9ae60d.tar.gz
upstream-8cb000c62fc7c6d478946ff36a666267df9ae60d.tar.bz2
upstream-8cb000c62fc7c6d478946ff36a666267df9ae60d.zip
brcm47xx: fix cpu clock detection on ASUS WL-520gU
The ASUS WL-520gU and some other similar Asus devices have a BCM5354 running at 200MHZ and not at 240 which is the default for this SoC. This fixes #4083. Backport of r34325. git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34377 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx/patches-3.3/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch b/target/linux/brcm47xx/patches-3.3/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch
new file mode 100644
index 0000000000..2ae45e8f44
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.3/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch
@@ -0,0 +1,44 @@
+--- 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 <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 = nvram_getenv("clkfreq", buf, sizeof(buf));
++ if (len >= 0 && !strncmp(buf, "200", 4))
++ hz = 100000000;
++ len = nvram_getenv("hardware_version", buf, sizeof(buf));
++ if (len >= 0 && !strncmp(buf, "WL520G", 6))
++ hz = 100000000;
++
++ }
+ if (!hz)
+ hz = 100000000;
+