aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-03-02 21:16:18 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-03-02 21:16:18 +0000
commit141d53ad0772cc875c3cafc8d95c3bf3a76ee35c (patch)
treeca531c1e43129c144154df7736400fa9a52ed82d /target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
parent0e4eaea770608e157530e7190651041008c93f96 (diff)
downloadupstream-141d53ad0772cc875c3cafc8d95c3bf3a76ee35c.tar.gz
upstream-141d53ad0772cc875c3cafc8d95c3bf3a76ee35c.tar.bz2
upstream-141d53ad0772cc875c3cafc8d95c3bf3a76ee35c.zip
brcm47xx: add support for kernel 2.6.33
Thanks to acoul and tripolar SVN-Revision: 19955
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
new file mode 100644
index 0000000000..f396ca745a
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch
@@ -0,0 +1,42 @@
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
+@@ -258,6 +258,8 @@ void ssb_chipco_resume(struct ssb_chipco
+ void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
+ u32 *plltype, u32 *n, u32 *m)
+ {
++ if ((chipco_read32(cc, SSB_CHIPCO_CHIPID) & SSB_CHIPCO_IDMASK) == 0x5354)
++ return;
+ *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
+ *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
+ switch (*plltype) {
+@@ -281,6 +283,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
+ void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
+ u32 *plltype, u32 *n, u32 *m)
+ {
++ if ((chipco_read32(cc, SSB_CHIPCO_CHIPID) & SSB_CHIPCO_IDMASK) == 0x5354)
++ return;
+ *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
+ *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
+ switch (*plltype) {
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -217,6 +217,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
+
+ if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
+ rate = 200000000;
++ } else if (bus->chip_id == 0x5354) {
++ rate = 240000000;
+ } else {
+ rate = ssb_calc_clock_rate(pll_type, n, m);
+ }
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -1069,6 +1069,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+
+ if (bus->chip_id == 0x5365) {
+ rate = 100000000;
++ } else if (bus->chip_id == 0x5354) {
++ rate = 120000000;
+ } else {
+ rate = ssb_calc_clock_rate(plltype, clkctl_n, clkctl_m);
+ if (plltype == SSB_PLLTYPE_3) /* 25Mhz, 2 dividers */