8 files changed, 117 insertions, 49 deletions

diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index e5a2e0e9bc19..b58fef780ea0 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 #include <linux/export.h>
+#ifdef CONFIG_BCM47XX
+#include <asm/mach-bcm47xx/nvram.h>
+#endif
 
 #include "ssb_private.h"
 
@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct ssb_chipcommon *cc,
         u32 pmuctl, tmp, pllctl;
         unsigned int i;
 
-        if ((bus->chip_id == 0x5354) && !crystalfreq) {
-                /* The 5354 crystal freq is 25MHz */
-                crystalfreq = 25000;
-        }
         if (crystalfreq)
                 e = pmu0_plltab_find_entry(crystalfreq);
         if (!e)
@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
         u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 
         if (bus->bustype == SSB_BUSTYPE_SSB) {
-                /* TODO: The user may override the crystal frequency. */
+#ifdef CONFIG_BCM47XX
+                char buf[20];
+                if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
+                        crystalfreq = simple_strtoul(buf, NULL, 0);
+#endif
         }
 
         switch (bus->chip_id) {
@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
                 ssb_pmu1_pllinit_r0(cc, crystalfreq);
                 break;
         case 0x4328:
+                ssb_pmu0_pllinit_r0(cc, crystalfreq);
+                break;
         case 0x5354:
+                if (crystalfreq == 0)
+                        crystalfreq = 25000;
                 ssb_pmu0_pllinit_r0(cc, crystalfreq);
                 break;
         case 0x4322:
@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
 
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
+
+u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
+{
+        struct ssb_bus *bus = cc->dev->bus;
+
+        switch (bus->chip_id) {
+        case 0x5354:
+                /* 5354 chip uses a non programmable PLL of frequency 240MHz */
+                return 240000000;
+        default:
+                ssb_printk(KERN_ERR PFX
+                           "ERROR: PMU cpu clock unknown for device %04X\n",
+                           bus->chip_id);
+                return 0;
+        }
+}
+
+u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
+{
+        struct ssb_bus *bus = cc->dev->bus;
+
+        switch (bus->chip_id) {
+        case 0x5354:
+                return 120000000;
+        default:
+                ssb_printk(KERN_ERR PFX
+                           "ERROR: PMU controlclock unknown for device %04X\n",
+                           bus->chip_id);
+                return 0;
+        }
+}
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index ced501568594..7e2ddc042f5b 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *mcore)
         struct ssb_bus *bus = mcore->dev->bus;
         u32 pll_type, n, m, rate = 0;
 
+        if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
+                return ssb_pmu_get_cpu_clock(&bus->chipco);
+
         if (bus->extif.dev) {
                 ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
         } else if (bus->chipco.dev) {
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index ff109ae94767..df0f145c22fc 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1078,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
         u32 plltype;
         u32 clkctl_n, clkctl_m;
 
+        if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
+                return ssb_pmu_get_controlclock(&bus->chipco);
+
         if (ssb_extif_available(&bus->extif))
                 ssb_extif_get_clockcontrol(&bus->extif, &plltype,
                                            &clkctl_n, &clkctl_m);
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 973223f5de8e..ed4124469a3a 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
 {
         int i;
         u16 v;
-        s8 gain;
         u16 loc[3];
 
         if (out->revision == 3)                 /* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
                 SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 
         /* Extract the antenna gain values. */
-        gain = r123_extract_antgain(out->revision, in,
-                                    SSB_SPROM1_AGAIN_BG,
-                                    SSB_SPROM1_AGAIN_BG_SHIFT);
-        out->antenna_gain.ghz24.a0 = gain;
-        out->antenna_gain.ghz24.a1 = gain;
-        out->antenna_gain.ghz24.a2 = gain;
-        out->antenna_gain.ghz24.a3 = gain;
-        gain = r123_extract_antgain(out->revision, in,
-                                    SSB_SPROM1_AGAIN_A,
-                                    SSB_SPROM1_AGAIN_A_SHIFT);
-        out->antenna_gain.ghz5.a0 = gain;
-        out->antenna_gain.ghz5.a1 = gain;
-        out->antenna_gain.ghz5.a2 = gain;
-        out->antenna_gain.ghz5.a3 = gain;
+        out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
+                                                    SSB_SPROM1_AGAIN_BG,
+                                                    SSB_SPROM1_AGAIN_BG_SHIFT);
+        out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
+                                                    SSB_SPROM1_AGAIN_A,
+                                                    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 
 /* Revs 4 5 and 8 have partially shared layout */
@@ -504,16 +495,14 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
         }
 
         /* Extract the antenna gain values. */
-        SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
+        SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
              SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
-        SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
+        SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
              SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
-        SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
+        SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
              SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
-        SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
+        SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
              SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
-        memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
-               sizeof(out->antenna_gain.ghz5));
 
         sprom_extract_r458(out, in);
 
@@ -523,7 +512,13 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
         int i;
-        u16 v;
+        u16 v, o;
+        u16 pwr_info_offset[] = {
+                SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
+                SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
+        };
+        BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
+                        ARRAY_SIZE(out->core_pwr_info));
 
         /* extract the MAC address */
         for (i = 0; i < 3; i++) {
@@ -596,16 +591,46 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
         SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 
         /* Extract the antenna gain values. */
-        SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
+        SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
              SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
-        SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
+        SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
              SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
-        SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
+        SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
              SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
-        SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
+        SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
              SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
-        memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
-               sizeof(out->antenna_gain.ghz5));
+
+        /* Extract cores power info info */
+        for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
+                o = pwr_info_offset[i];
+                SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                        SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
+                SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                        SSB_SPROM8_2G_MAXP, 0);
+
+                SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
+
+                SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                        SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
+                SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                        SSB_SPROM8_5G_MAXP, 0);
+                SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
+                        SSB_SPROM8_5GH_MAXP, 0);
+                SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
+                        SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
+
+                SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
+        }
 
         /* Extract FEM info */
         SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index c821c6b2a6a0..fbafed5b729b 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
         case SSB_PCMCIA_CIS_ANTGAIN:
                 GOTO_ERROR_ON(tuple->TupleDataLen != 2,
                         "antg tpl size");
-                sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
-                sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
+                sprom->antenna_gain.a0 = tuple->TupleData[1];
+                sprom->antenna_gain.a1 = tuple->TupleData[1];
+                sprom->antenna_gain.a2 = tuple->TupleData[1];
+                sprom->antenna_gain.a3 = tuple->TupleData[1];
                 break;
         case SSB_PCMCIA_CIS_BFLAGS:
                 GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 3e844874631f..266c7c5c86dc 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
                         bus->chip_package = 0;
                 }
         }
+        ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
+                   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
+                   bus->chip_package);
         if (!bus->nr_devices)
                 bus->nr_devices = chipid_to_nrcores(bus->chip_id);
         if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
diff --git a/drivers/ssb/sdio.c b/drivers/ssb/sdio.c
index 63fd709038ca..b2d36f7736c5 100644
--- a/drivers/ssb/sdio.c
+++ b/drivers/ssb/sdio.c
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_bus *bus,
                         case SSB_SDIO_CIS_ANTGAIN:
                                 GOTO_ERROR_ON(tuple->size != 2,
                                               "antg tpl size");
-                                sprom->antenna_gain.ghz24.a0 = tuple->data[1];
-                                sprom->antenna_gain.ghz24.a1 = tuple->data[1];
-                                sprom->antenna_gain.ghz24.a2 = tuple->data[1];
-                                sprom->antenna_gain.ghz24.a3 = tuple->data[1];
-                                sprom->antenna_gain.ghz5.a0 = tuple->data[1];
-                                sprom->antenna_gain.ghz5.a1 = tuple->data[1];
-                                sprom->antenna_gain.ghz5.a2 = tuple->data[1];
-                                sprom->antenna_gain.ghz5.a3 = tuple->data[1];
+                                sprom->antenna_gain.a0 = tuple->data[1];
+                                sprom->antenna_gain.a1 = tuple->data[1];
+                                sprom->antenna_gain.a2 = tuple->data[1];
+                                sprom->antenna_gain.a3 = tuple->data[1];
                                 break;
                         case SSB_SDIO_CIS_BFLAGS:
                                 GOTO_ERROR_ON((tuple->size != 3) &&
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 77653014db0b..a305550b4b65 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_exit(void)
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 
+/* driver_chipcommon_pmu.c */
+extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
+extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
+
 #endif /* LINUX_SSB_PRIVATE_H_ */