diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-10-06 20:11:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-10-06 20:11:03 +0000 |
| commit | badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c (patch) | |
| tree | 132b98754ab442130adb4465bbf54ad164e0fb78 /target/linux/brcm47xx/patches-2.6.36/220-bcm5354.patch | |
| parent | 8c33c86021965aff7ccd01b1a9c352318631840c (diff) | |
| download | upstream-badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c.tar.gz upstream-badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c.tar.bz2 upstream-badd8ffee3f2c34fe9a8188ff1f58a9a5dde874c.zip | |
brcm47xx: add patches for kernel 2.6.36
SVN-Revision: 23278
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.36/220-bcm5354.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.36/220-bcm5354.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.36/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.36/220-bcm5354.patch new file mode 100644 index 0000000000..92bb400741 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.36/220-bcm5354.patch @@ -0,0 +1,42 @@ +--- a/drivers/ssb/driver_chipcommon.c ++++ b/drivers/ssb/driver_chipcommon.c +@@ -285,6 +285,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) { +@@ -308,6 +310,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 +@@ -1074,6 +1074,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 */ |