6dd2e9ae2c
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
41 lines
956 B
Diff
41 lines
956 B
Diff
--- 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;
|
|
|