summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-07 00:00:10 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-07 00:00:10 +0000
commit2402f8a9ee919020827f3a303480f18d3ed416b6 (patch)
treef36a94a42276f422b27c737c92ec55bea30df947 /target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch
parent4c193a30ce2f925a67ea90a0ceefeddea50d54e4 (diff)
downloadmaster-31e0f0ae-2402f8a9ee919020827f3a303480f18d3ed416b6.tar.gz
master-31e0f0ae-2402f8a9ee919020827f3a303480f18d3ed416b6.tar.bz2
master-31e0f0ae-2402f8a9ee919020827f3a303480f18d3ed416b6.zip
brcm47xx: move clock detection patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38311
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch41
1 files changed, 0 insertions, 41 deletions
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
deleted file mode 100644
index 346e33530b..0000000000
--- a/target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch
+++ /dev/null
@@ -1,41 +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,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;
-