2010-01-07 18:06:05 +02:00
|
|
|
--- a/drivers/ssb/driver_chipcommon.c
|
|
|
|
+++ b/drivers/ssb/driver_chipcommon.c
|
2010-11-07 17:59:49 +02:00
|
|
|
@@ -261,6 +261,8 @@ void ssb_chipco_resume(struct ssb_chipco
|
2010-01-07 18:06:05 +02:00
|
|
|
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) {
|
2010-11-07 17:59:49 +02:00
|
|
|
@@ -284,6 +286,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
|
2010-01-07 18:06:05 +02:00
|
|
|
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
|
2010-02-20 21:31:13 +02:00
|
|
|
@@ -217,6 +217,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
|
2010-01-07 18:06:05 +02:00
|
|
|
|
|
|
|
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
|
2010-11-07 17:59:49 +02:00
|
|
|
@@ -1075,6 +1075,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
2010-01-07 18:06:05 +02:00
|
|
|
|
|
|
|
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 */
|