4 files changed, 47 insertions, 86 deletions

diff --git a/drivers/ssb/driver_chipcommon.c b/drivers/ssb/driver_chipcommon.c
index 59ae76bace14..7c031fdc8205 100644
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -209,6 +209,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 +236,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 +259,7 @@ 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);
         ssb_pmu_init(cc);
         chipco_powercontrol_init(cc);
         ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 3d551245a4e2..5732bb2c3578 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)
                 chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */
 void ssb_pmu_init(struct ssb_chipcommon *cc)
 {
-        struct ssb_bus *bus = cc->dev->bus;
         u32 pmucap;
 
         if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon *cc)
         ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
                     cc->pmu.rev, pmucap);
 
-        if (cc->pmu.rev >= 1) {
-                if ((bus->chip_id == 0x4325) && (bus->chip_rev < 2)) {
-                        chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
-                                      ~SSB_CHIPCO_PMU_CTL_NOILPONW);
-                } else {
-                        chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
-                                     SSB_CHIPCO_PMU_CTL_NOILPONW);
-                }
-        }
+        if (cc->pmu.rev == 1)
+                chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
+                              ~SSB_CHIPCO_PMU_CTL_NOILPONW);
+        else
+                chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
+                             SSB_CHIPCO_PMU_CTL_NOILPONW);
         ssb_pmu_pll_init(cc);
         ssb_pmu_resources_init(cc);
 }
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 51275aac5b34..7cee7f4eb60b 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -486,6 +486,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
 #ifdef CONFIG_SSB_PCIHOST
                         sdev->irq = bus->host_pci->irq;
                         dev->parent = &bus->host_pci->dev;
+                        sdev->dma_dev = dev->parent;
 #endif
                         break;
                 case SSB_BUSTYPE_PCMCIA:
@@ -501,6 +502,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
                         break;
                 case SSB_BUSTYPE_SSB:
                         dev->dma_mask = &dev->coherent_dma_mask;
+                        sdev->dma_dev = dev;
                         break;
                 }
 
@@ -1226,80 +1228,6 @@ u32 ssb_dma_translation(struct ssb_device *dev)
 }
 EXPORT_SYMBOL(ssb_dma_translation);
 
-int ssb_dma_set_mask(struct ssb_device *dev, u64 mask)
-{
-#ifdef CONFIG_SSB_PCIHOST
-        int err;
-#endif
-
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                err = pci_set_dma_mask(dev->bus->host_pci, mask);
-                if (err)
-                        return err;
-                err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask);
-                return err;
-#endif
-        case SSB_BUSTYPE_SSB:
-                return dma_set_mask(dev->dev, mask);
-        default:
-                __ssb_dma_not_implemented(dev);
-        }
-        return -ENOSYS;
-}
-EXPORT_SYMBOL(ssb_dma_set_mask);
-
-void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
-                                dma_addr_t *dma_handle, gfp_t gfp_flags)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                if (gfp_flags & GFP_DMA) {
-                        /* Workaround: The PCI API does not support passing
-                         * a GFP flag. */
-                        return dma_alloc_coherent(&dev->bus->host_pci->dev,
-                                                  size, dma_handle, gfp_flags);
-                }
-                return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle);
-#endif
-        case SSB_BUSTYPE_SSB:
-                return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags);
-        default:
-                __ssb_dma_not_implemented(dev);
-        }
-        return NULL;
-}
-EXPORT_SYMBOL(ssb_dma_alloc_consistent);
-
-void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
-                             void *vaddr, dma_addr_t dma_handle,
-                             gfp_t gfp_flags)
-{
-        switch (dev->bus->bustype) {
-        case SSB_BUSTYPE_PCI:
-#ifdef CONFIG_SSB_PCIHOST
-                if (gfp_flags & GFP_DMA) {
-                        /* Workaround: The PCI API does not support passing
-                         * a GFP flag. */
-                        dma_free_coherent(&dev->bus->host_pci->dev,
-                                          size, vaddr, dma_handle);
-                        return;
-                }
-                pci_free_consistent(dev->bus->host_pci, size,
-                                    vaddr, dma_handle);
-                return;
-#endif
-        case SSB_BUSTYPE_SSB:
-                dma_free_coherent(dev->dev, size, vaddr, dma_handle);
-                return;
-        default:
-                __ssb_dma_not_implemented(dev);
-        }
-}
-EXPORT_SYMBOL(ssb_dma_free_consistent);
-
 int ssb_bus_may_powerdown(struct ssb_bus *bus)
 {
         struct ssb_chipcommon *cc;
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 6dcda86be6eb..6e88d2b603b4 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -626,11 +626,22 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                 return -ENODEV;
         }
         if (bus->chipco.dev) {  /* can be unavailible! */
-                bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
-                        SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
+                /*
+                 * get SPROM offset: SSB_SPROM_BASE1 except for
+                 * chipcommon rev >= 31 or chip ID is 0x4312 and
+                 * chipcommon status & 3 == 2
+                 */
+                if (bus->chipco.dev->id.revision >= 31)
+                        bus->sprom_offset = SSB_SPROM_BASE31;
+                else if (bus->chip_id == 0x4312 &&
+                         (bus->chipco.status & 0x03) == 2)
+                        bus->sprom_offset = SSB_SPROM_BASE31;
+                else
+                        bus->sprom_offset = SSB_SPROM_BASE1;
         } else {
                 bus->sprom_offset = SSB_SPROM_BASE1;
         }
+        ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
 
         buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
         if (!buf)