target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch

   1 Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
   2 ===================================================================
   3 --- linux-2.6.25.4.orig/drivers/ssb/driver_chipcommon.c
   4 +++ linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
   5 @@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
   6  void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
   7                               u32 *plltype, u32 *n, u32 *m)
   8  {
   9 +       if ((chipco_read32(cc, SSB_CHIPCO_CHIPID) & SSB_CHIPCO_IDMASK) == 0x5354)
  10 +               return;
  11         *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
  12         *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
  13         switch (*plltype) {
  14 @@ -293,6 +295,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
  15  void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
  16                                  u32 *plltype, u32 *n, u32 *m)
  17  {
  18 +       if ((chipco_read32(cc, SSB_CHIPCO_CHIPID) & SSB_CHIPCO_IDMASK) == 0x5354)
  19 +               return;
  20         *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
  21         *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
  22         switch (*plltype) {
  23 Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
  24 ===================================================================
  25 --- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c
  26 +++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c
  27 @@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
  28
  29         if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
  30                 rate = 200000000;
  31 +       } else if (bus->chip_id == 0x5354) {
  32 +               rate = 240000000;
  33         } else {
  34                 rate = ssb_calc_clock_rate(pll_type, n, m);
  35         }
  36 Index: linux-2.6.25.4/drivers/ssb/main.c
  37 ===================================================================
  38 --- linux-2.6.25.4.orig/drivers/ssb/main.c
  39 +++ linux-2.6.25.4/drivers/ssb/main.c
  40 @@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
  41
  42         if (bus->chip_id == 0x5365) {
  43                 rate = 100000000;
  44 +       } else if (bus->chip_id == 0x5354) {
  45 +               rate = 120000000;
  46         } else {
  47                 rate = ssb_calc_clock_rate(plltype, clkctl_n, clkctl_m);
  48                 if (plltype == SSB_PLLTYPE_3) /* 25Mhz, 2 dividers */