X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx-2.6%2Ffiles%2Fdrivers%2Fssb%2Fdriver_mips%2Fmips.c;h=7b3880ab01a32f436c50a02571db4b68d1f9577b;hb=742cf09a44cbd3b95f159f2262558a038457add5;hp=65916b17bafce1b12547386c3b93a456ed9e234e;hpb=278faa8f77fd87f2b20d98a93c3707ab72d2f696;p=openwrt-10.03%2F.git

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;