diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-09-18 14:36:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-09-18 14:36:03 +0000 |
| commit | 80d7a3558d6cfa19268aafa6b5c1dc6fd1cf56cb (patch) | |
| tree | f803b51150a93ba806224c81a3c85c68bf416184 /target/linux/brcm47xx | |
| parent | 3d8f232fdab46b60d14a8a02a7fd22790963ac99 (diff) | |
| download | upstream-80d7a3558d6cfa19268aafa6b5c1dc6fd1cf56cb.tar.gz upstream-80d7a3558d6cfa19268aafa6b5c1dc6fd1cf56cb.tar.bz2 upstream-80d7a3558d6cfa19268aafa6b5c1dc6fd1cf56cb.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38037 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-clock-detection-for-BCM5354-with-20.patch (renamed from target/linux/brcm47xx/patches-3.10/520-MIPS-BCM47XX-fix-time-for-WL520G-and-other-200-MHz-C.patch) | 7 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/521-MIPS-BCM47XX-fix-detected-clock-on-Asus-WL520GC-and-.patch | 34 |
2 files changed, 36 insertions, 5 deletions
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-clock-detection-for-BCM5354-with-20.patch index ff670e87a9..346e33530b 100644 --- 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-clock-detection-for-BCM5354-with-20.patch @@ -15,7 +15,7 @@ /* * Use deterministic values for initial counter interrupt -@@ -43,15 +47,26 @@ void __init plat_time_init(void) +@@ -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; @@ -34,11 +34,8 @@ + 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; + |