diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-22 20:23:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-22 20:23:17 +0000 |
| commit | 5d28e0fd0e2f66635d26a9436c3cf2cc001c67a5 (patch) | |
| tree | 575e318881df100f2d5fe7c00ad5fde4666f8e64 /target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips | |
| parent | d9b2f5c07bbb0cbe4b5e2b199960a02f7fc62b0e (diff) | |
| download | upstream-5d28e0fd0e2f66635d26a9436c3cf2cc001c67a5.tar.gz upstream-5d28e0fd0e2f66635d26a9436c3cf2cc001c67a5.tar.bz2 upstream-5d28e0fd0e2f66635d26a9436c3cf2cc001c67a5.zip | |
add brcm47xx-2.6 fixes from #1496
SVN-Revision: 6639
Diffstat (limited to 'target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips')
| -rw-r--r-- | target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips/mips.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips/mips.c b/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips/mips.c index 65916b17ba..7b3880ab01 100644 --- a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips/mips.c +++ b/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips/mips.c @@ -215,15 +215,14 @@ u32 ssb_cpu_clock(struct ssb_mipscore *mcore) if (bus->extif.dev) { ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m); } else if (bus->chipco.dev) { - if (bus->chip_id == 0x5365) - /* FIXME: is this override really necessary? */ - return 200000000; - - ssb_chipco_get_clockcontrol(&bus->chipco, &pll_type, &n, &m); + ssb_chipco_get_clockcpu(&bus->chipco, bus->chip_id, &rate, + &pll_type, &n, &m); } else return 0; - rate = ssb_calc_clock_rate(pll_type, n, m); + if (rate == 0) + rate = ssb_calc_clock_rate(pll_type, n, m); + if (pll_type == SSB_PLLTYPE_6) rate *= 2; |