mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-09 22:15:55 +02:00
a11dfce7a2
(This is mostly just drivers/ssb and include/linux/ssb)
[brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set
Default is still to build against 2.6.23.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11155 3c298f89-4303-0410-b956-a3cf2f4a3e73
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
Index: linux-2.6.25/drivers/ssb/driver_chipcommon.c
|
|
===================================================================
|
|
--- linux-2.6.25.orig/drivers/ssb/driver_chipcommon.c 2008-04-27 21:36:52.000000000 +0100
|
|
+++ linux-2.6.25/drivers/ssb/driver_chipcommon.c 2008-04-27 21:43:50.000000000 +0100
|
|
@@ -270,6 +270,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) {
|
|
@@ -293,6 +295,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) {
|
|
Index: linux-2.6.25/drivers/ssb/driver_mipscore.c
|
|
===================================================================
|
|
--- linux-2.6.25.orig/drivers/ssb/driver_mipscore.c 2008-04-17 03:49:44.000000000 +0100
|
|
+++ linux-2.6.25/drivers/ssb/driver_mipscore.c 2008-04-27 21:43:50.000000000 +0100
|
|
@@ -161,6 +161,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);
|
|
}
|
|
Index: linux-2.6.25/drivers/ssb/main.c
|
|
===================================================================
|
|
--- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-17 03:49:44.000000000 +0100
|
|
+++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:43:50.000000000 +0100
|
|
@@ -867,6 +867,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 */
|