diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-22 20:23:17 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-22 20:23:17 +0000 |
| commit | b97f8ef70b5ac2844b8dd6afbb247e80b2bf7787 (patch) | |
| tree | db2aac023a7b76326377483a1c05b3e08848986f /target/linux/brcm47xx-2.6/files/drivers/ssb/driver_mips | |
| parent | 6d08e7e4fe48d4145afd0d435c31caeba0e2a7db (diff) | |
add brcm47xx-2.6 fixes from #1496
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6639 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 65916b17b..7b3880ab0 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; |