Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[~andy/linux] / drivers / ssb / driver_chipcommon.c

diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index 59ae76bace14cb740483484b1a6a21b08157f259..06d15b6f2215694b1c380c3891c4bedbf726858e 100644 (file)
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -46,40 +46,66 @@ void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
        if (!ccdev)
                return;
        bus = ccdev->bus;
+
+       /* We support SLOW only on 6..9 */
+       if (ccdev->id.revision >= 10 && mode == SSB_CLKMODE_SLOW)
+               mode = SSB_CLKMODE_DYNAMIC;
+
+       if (cc->capabilities & SSB_CHIPCO_CAP_PMU)
+               return; /* PMU controls clockmode, separated function needed */
+       SSB_WARN_ON(ccdev->id.revision >= 20);
+
        /* chipcommon cores prior to rev6 don't support dynamic clock control */
        if (ccdev->id.revision < 6)
                return;
-       /* chipcommon cores rev10 are a whole new ball game */
+
+       /* ChipCommon cores rev10+ need testing */
        if (ccdev->id.revision >= 10)
                return;
+
        if (!(cc->capabilities & SSB_CHIPCO_CAP_PCTL))
                return;
 
        switch (mode) {
-       case SSB_CLKMODE_SLOW:
+       case SSB_CLKMODE_SLOW: /* For revs 6..9 only */
                tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
                tmp |= SSB_CHIPCO_SLOWCLKCTL_FSLOW;
                chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
                break;
        case SSB_CLKMODE_FAST:
-               ssb_pci_xtal(bus, SSB_GPIO_XTAL, 1); /* Force crystal on */
-               tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
-               tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
-               tmp |= SSB_CHIPCO_SLOWCLKCTL_IPLL;
-               chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
+               if (ccdev->id.revision < 10) {
+                       ssb_pci_xtal(bus, SSB_GPIO_XTAL, 1); /* Force crystal on */
+                       tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
+                       tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
+                       tmp |= SSB_CHIPCO_SLOWCLKCTL_IPLL;
+                       chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
+               } else {
+                       chipco_write32(cc, SSB_CHIPCO_SYSCLKCTL,
+                               (chipco_read32(cc, SSB_CHIPCO_SYSCLKCTL) |
+                                SSB_CHIPCO_SYSCLKCTL_FORCEHT));
+                       /* udelay(150); TODO: not available in early init */
+               }
                break;
        case SSB_CLKMODE_DYNAMIC:
-               tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
-               tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
-               tmp &= ~SSB_CHIPCO_SLOWCLKCTL_IPLL;
-               tmp &= ~SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
-               if ((tmp & SSB_CHIPCO_SLOWCLKCTL_SRC) != SSB_CHIPCO_SLOWCLKCTL_SRC_XTAL)
-                       tmp |= SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
-               chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
-
-               /* for dynamic control, we have to release our xtal_pu "force on" */
-               if (tmp & SSB_CHIPCO_SLOWCLKCTL_ENXTAL)
-                       ssb_pci_xtal(bus, SSB_GPIO_XTAL, 0);
+               if (ccdev->id.revision < 10) {
+                       tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
+                       tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
+                       tmp &= ~SSB_CHIPCO_SLOWCLKCTL_IPLL;
+                       tmp &= ~SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
+                       if ((tmp & SSB_CHIPCO_SLOWCLKCTL_SRC) !=
+                           SSB_CHIPCO_SLOWCLKCTL_SRC_XTAL)
+                               tmp |= SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
+                       chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
+
+                       /* For dynamic control, we have to release our xtal_pu
+                        * "force on" */
+                       if (tmp & SSB_CHIPCO_SLOWCLKCTL_ENXTAL)
+                               ssb_pci_xtal(bus, SSB_GPIO_XTAL, 0);
+               } else {
+                       chipco_write32(cc, SSB_CHIPCO_SYSCLKCTL,
+                               (chipco_read32(cc, SSB_CHIPCO_SYSCLKCTL) &
+                                ~SSB_CHIPCO_SYSCLKCTL_FORCEHT));
+               }
                break;
        default:
                SSB_WARN_ON(1);
@@ -209,6 +235,24 @@ static void chipco_powercontrol_init(struct ssb_chipcommon *cc)
        }
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PmuFastPwrupDelay */
+static u16 pmu_fast_powerup_delay(struct ssb_chipcommon *cc)
+{
+       struct ssb_bus *bus = cc->dev->bus;
+
+       switch (bus->chip_id) {
+       case 0x4312:
+       case 0x4322:
+       case 0x4328:
+               return 7000;
+       case 0x4325:
+               /* TODO: */
+       default:
+               return 15000;
+       }
+}
+
+/* http://bcm-v4.sipsolutions.net/802.11/ClkctlFastPwrupDelay */
 static void calc_fast_powerup_delay(struct ssb_chipcommon *cc)
 {
        struct ssb_bus *bus = cc->dev->bus;
@@ -218,6 +262,12 @@ static void calc_fast_powerup_delay(struct ssb_chipcommon *cc)
 
        if (bus->bustype != SSB_BUSTYPE_PCI)
                return;
+
+       if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
+               cc->fast_pwrup_delay = pmu_fast_powerup_delay(cc);
+               return;
+       }
+
        if (!(cc->capabilities & SSB_CHIPCO_CAP_PCTL))
                return;
 
@@ -235,6 +285,13 @@ void ssb_chipcommon_init(struct ssb_chipcommon *cc)
                return; /* We don't have a ChipCommon */
        if (cc->dev->id.revision >= 11)
                cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
+       ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
+
+       if (cc->dev->id.revision >= 20) {
+               chipco_write32(cc, SSB_CHIPCO_GPIOPULLUP, 0);
+               chipco_write32(cc, SSB_CHIPCO_GPIOPULLDOWN, 0);
+       }
+
        ssb_pmu_init(cc);
        chipco_powercontrol_init(cc);
        ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);