3 files changed, 129 insertions, 16 deletions

diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 5ae8fa22d331..3d0a9ff24f01 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -27,24 +27,54 @@ struct ssb_sprom {
         u8 et1mdcport;          /* MDIO for enet1 */
         u8 board_rev;           /* Board revision number from SPROM. */
         u8 country_code;        /* Country Code */
-        u8 ant_available_a;     /* A-PHY antenna available bits (up to 4) */
-        u8 ant_available_bg;    /* B/G-PHY antenna available bits (up to 4) */
+        u8 ant_available_a;     /* 2GHz antenna available bits (up to 4) */
+        u8 ant_available_bg;    /* 5GHz antenna available bits (up to 4) */
         u16 pa0b0;
         u16 pa0b1;
         u16 pa0b2;
         u16 pa1b0;
         u16 pa1b1;
         u16 pa1b2;
+        u16 pa1lob0;
+        u16 pa1lob1;
+        u16 pa1lob2;
+        u16 pa1hib0;
+        u16 pa1hib1;
+        u16 pa1hib2;
         u8 gpio0;               /* GPIO pin 0 */
         u8 gpio1;               /* GPIO pin 1 */
         u8 gpio2;               /* GPIO pin 2 */
         u8 gpio3;               /* GPIO pin 3 */
-        u16 maxpwr_a;           /* A-PHY Amplifier Max Power (in dBm Q5.2) */
-        u16 maxpwr_bg;          /* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_bg;          /* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_al;          /* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_a;           /* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_ah;          /* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
         u8 itssi_a;             /* Idle TSSI Target for A-PHY */
         u8 itssi_bg;            /* Idle TSSI Target for B/G-PHY */
-        u16 boardflags_lo;      /* Boardflags (low 16 bits) */
-        u16 boardflags_hi;      /* Boardflags (high 16 bits) */
+        u8 tri2g;               /* 2.4GHz TX isolation */
+        u8 tri5gl;              /* 5.2GHz TX isolation */
+        u8 tri5g;               /* 5.3GHz TX isolation */
+        u8 tri5gh;              /* 5.8GHz TX isolation */
+        u8 rxpo2g;              /* 2GHz RX power offset */
+        u8 rxpo5g;              /* 5GHz RX power offset */
+        u8 rssisav2g;           /* 2GHz RSSI params */
+        u8 rssismc2g;
+        u8 rssismf2g;
+        u8 bxa2g;               /* 2GHz BX arch */
+        u8 rssisav5g;           /* 5GHz RSSI params */
+        u8 rssismc5g;
+        u8 rssismf5g;
+        u8 bxa5g;               /* 5GHz BX arch */
+        u16 cck2gpo;            /* CCK power offset */
+        u32 ofdm2gpo;           /* 2.4GHz OFDM power offset */
+        u32 ofdm5glpo;          /* 5.2GHz OFDM power offset */
+        u32 ofdm5gpo;           /* 5.3GHz OFDM power offset */
+        u32 ofdm5ghpo;          /* 5.8GHz OFDM power offset */
+        u16 boardflags_lo;      /* Board flags (bits 0-15) */
+        u16 boardflags_hi;      /* Board flags (bits 16-31) */
+        u16 boardflags2_lo;     /* Board flags (bits 32-47) */
+        u16 boardflags2_hi;     /* Board flags (bits 48-63) */
+        /* TODO store board flags in a single u64 */
 
         /* Antenna gain values for up to 4 antennas
          * on each band. Values in dBm/4 (Q5.2). Negative gain means the
@@ -58,7 +88,7 @@ struct ssb_sprom {
                 } ghz5;         /* 5GHz band */
         } antenna_gain;
 
-        /* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
+        /* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 };
 
 /* Information about the PCB the circuitry is soldered on. */
@@ -208,6 +238,7 @@ enum ssb_bustype {
         SSB_BUSTYPE_SSB,        /* This SSB bus is the system bus */
         SSB_BUSTYPE_PCI,        /* SSB is connected to PCI bus */
         SSB_BUSTYPE_PCMCIA,     /* SSB is connected to PCMCIA bus */
+        SSB_BUSTYPE_SDIO,       /* SSB is connected to SDIO bus */
 };
 
 /* board_vendor */
@@ -240,8 +271,12 @@ struct ssb_bus {
 
         /* The core in the basic address register window. (PCI bus only) */
         struct ssb_device *mapped_device;
-        /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
-        u8 mapped_pcmcia_seg;
+        union {
+                /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
+                u8 mapped_pcmcia_seg;
+                /* Current SSB base address window for SDIO. */
+                u32 sdio_sbaddr;
+        };
         /* Lock for core and segment switching.
          * On PCMCIA-host busses this is used to protect the whole MMIO access. */
         spinlock_t bar_lock;
@@ -252,6 +287,11 @@ struct ssb_bus {
         struct pci_dev *host_pci;
         /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
         struct pcmcia_device *host_pcmcia;
+        /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
+        struct sdio_func *host_sdio;
+
+        /* See enum ssb_quirks */
+        unsigned int quirks;
 
 #ifdef CONFIG_SSB_SPROM
         /* Mutex to protect the SPROM writing. */
@@ -306,6 +346,11 @@ struct ssb_bus {
 #endif /* DEBUG */
 };
 
+enum ssb_quirks {
+        /* SDIO connected card requires performing a read after writing a 32-bit value */
+        SSB_QUIRK_SDIO_READ_AFTER_WRITE32       = (1 << 0),
+};
+
 /* The initialization-invariants. */
 struct ssb_init_invariants {
         /* Versioning information about the PCB. */
@@ -336,6 +381,12 @@ extern int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
                                       struct pcmcia_device *pcmcia_dev,
                                       unsigned long baseaddr);
 #endif /* CONFIG_SSB_PCMCIAHOST */
+#ifdef CONFIG_SSB_SDIOHOST
+extern int ssb_bus_sdiobus_register(struct ssb_bus *bus,
+                                    struct sdio_func *sdio_func,
+                                    unsigned int quirks);
+#endif /* CONFIG_SSB_SDIOHOST */
+
 
 extern void ssb_bus_unregister(struct ssb_bus *bus);
 
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
index d3b1d18922f2..4e27acf0a92f 100644
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -629,5 +629,15 @@ extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
 /* PMU support */
 extern void ssb_pmu_init(struct ssb_chipcommon *cc);
 
+enum ssb_pmu_ldo_volt_id {
+        LDO_PAREF = 0,
+        LDO_VOLT1,
+        LDO_VOLT2,
+        LDO_VOLT3,
+};
+
+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
+                             enum ssb_pmu_ldo_volt_id id, u32 voltage);
+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
 
 #endif /* LINUX_SSB_CHIPCO_H_ */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index a01b982b5783..9ae9082eaeb4 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -162,7 +162,7 @@
 
 /* SPROM shadow area. If not otherwise noted, fields are
  * two bytes wide. Note that the SPROM can _only_ be read
- * in two-byte quantinies.
+ * in two-byte quantities.
  */
 #define SSB_SPROMSIZE_WORDS             64
 #define SSB_SPROMSIZE_BYTES             (SSB_SPROMSIZE_WORDS * sizeof(u16))
@@ -327,8 +327,11 @@
 #define  SSB_SPROM5_GPIOB_P3_SHIFT      8
 
 /* SPROM Revision 8 */
-#define SSB_SPROM8_BFLLO                0x1084  /* Boardflags (low 16 bits) */
-#define SSB_SPROM8_BFLHI                0x1086  /* Boardflags Hi */
+#define SSB_SPROM8_BOARDREV             0x1082  /* Board revision */
+#define SSB_SPROM8_BFLLO                0x1084  /* Board flags (bits 0-15) */
+#define SSB_SPROM8_BFLHI                0x1086  /* Board flags (bits 16-31) */
+#define SSB_SPROM8_BFL2LO               0x1088  /* Board flags (bits 32-47) */
+#define SSB_SPROM8_BFL2HI               0x108A  /* Board flags (bits 48-63) */
 #define SSB_SPROM8_IL0MAC               0x108C  /* 6 byte MAC address */
 #define SSB_SPROM8_CCODE                0x1092  /* 2 byte country code */
 #define SSB_SPROM8_ANTAVAIL             0x109C  /* Antenna available bitfields*/
@@ -354,14 +357,63 @@
 #define  SSB_SPROM8_GPIOB_P2            0x00FF  /* Pin 2 */
 #define  SSB_SPROM8_GPIOB_P3            0xFF00  /* Pin 3 */
 #define  SSB_SPROM8_GPIOB_P3_SHIFT      8
-#define SSB_SPROM8_MAXP_BG              0x10C0  /* Max Power BG in path 1 */
-#define  SSB_SPROM8_MAXP_BG_MASK        0x00FF  /* Mask for Max Power BG */
+#define SSB_SPROM8_RSSIPARM2G           0x10A4  /* RSSI params for 2GHz */
+#define  SSB_SPROM8_RSSISMF2G           0x000F
+#define  SSB_SPROM8_RSSISMC2G           0x00F0
+#define  SSB_SPROM8_RSSISMC2G_SHIFT     4
+#define  SSB_SPROM8_RSSISAV2G           0x0700
+#define  SSB_SPROM8_RSSISAV2G_SHIFT     8
+#define  SSB_SPROM8_BXA2G               0x1800
+#define  SSB_SPROM8_BXA2G_SHIFT         11
+#define SSB_SPROM8_RSSIPARM5G           0x10A6  /* RSSI params for 5GHz */
+#define  SSB_SPROM8_RSSISMF5G           0x000F
+#define  SSB_SPROM8_RSSISMC5G           0x00F0
+#define  SSB_SPROM8_RSSISMC5G_SHIFT     4
+#define  SSB_SPROM8_RSSISAV5G           0x0700
+#define  SSB_SPROM8_RSSISAV5G_SHIFT     8
+#define  SSB_SPROM8_BXA5G               0x1800
+#define  SSB_SPROM8_BXA5G_SHIFT         11
+#define SSB_SPROM8_TRI25G               0x10A8  /* TX isolation 2.4&5.3GHz */
+#define  SSB_SPROM8_TRI2G               0x00FF  /* TX isolation 2.4GHz */
+#define  SSB_SPROM8_TRI5G               0xFF00  /* TX isolation 5.3GHz */
+#define  SSB_SPROM8_TRI5G_SHIFT         8
+#define SSB_SPROM8_TRI5GHL              0x10AA  /* TX isolation 5.2/5.8GHz */
+#define  SSB_SPROM8_TRI5GL              0x00FF  /* TX isolation 5.2GHz */
+#define  SSB_SPROM8_TRI5GH              0xFF00  /* TX isolation 5.8GHz */
+#define  SSB_SPROM8_TRI5GH_SHIFT        8
+#define SSB_SPROM8_RXPO                 0x10AC  /* RX power offsets */
+#define  SSB_SPROM8_RXPO2G              0x00FF  /* 2GHz RX power offset */
+#define  SSB_SPROM8_RXPO5G              0xFF00  /* 5GHz RX power offset */
+#define  SSB_SPROM8_RXPO5G_SHIFT        8
+#define SSB_SPROM8_MAXP_BG              0x10C0  /* Max Power 2GHz in path 1 */
+#define  SSB_SPROM8_MAXP_BG_MASK        0x00FF  /* Mask for Max Power 2GHz */
 #define  SSB_SPROM8_ITSSI_BG            0xFF00  /* Mask for path 1 itssi_bg */
 #define  SSB_SPROM8_ITSSI_BG_SHIFT      8
-#define SSB_SPROM8_MAXP_A               0x10C8  /* Max Power A in path 1 */
-#define  SSB_SPROM8_MAXP_A_MASK         0x00FF  /* Mask for Max Power A */
+#define SSB_SPROM8_PA0B0                0x10C2  /* 2GHz power amp settings */
+#define SSB_SPROM8_PA0B1                0x10C4
+#define SSB_SPROM8_PA0B2                0x10C6
+#define SSB_SPROM8_MAXP_A               0x10C8  /* Max Power 5.3GHz */
+#define  SSB_SPROM8_MAXP_A_MASK         0x00FF  /* Mask for Max Power 5.3GHz */
 #define  SSB_SPROM8_ITSSI_A             0xFF00  /* Mask for path 1 itssi_a */
 #define  SSB_SPROM8_ITSSI_A_SHIFT       8
+#define SSB_SPROM8_MAXP_AHL             0x10CA  /* Max Power 5.2/5.8GHz */
+#define  SSB_SPROM8_MAXP_AH_MASK        0x00FF  /* Mask for Max Power 5.8GHz */
+#define  SSB_SPROM8_MAXP_AL_MASK        0xFF00  /* Mask for Max Power 5.2GHz */
+#define  SSB_SPROM8_MAXP_AL_SHIFT       8
+#define SSB_SPROM8_PA1B0                0x10CC  /* 5.3GHz power amp settings */
+#define SSB_SPROM8_PA1B1                0x10CE
+#define SSB_SPROM8_PA1B2                0x10D0
+#define SSB_SPROM8_PA1LOB0              0x10D2  /* 5.2GHz power amp settings */
+#define SSB_SPROM8_PA1LOB1              0x10D4
+#define SSB_SPROM8_PA1LOB2              0x10D6
+#define SSB_SPROM8_PA1HIB0              0x10D8  /* 5.8GHz power amp settings */
+#define SSB_SPROM8_PA1HIB1              0x10DA
+#define SSB_SPROM8_PA1HIB2              0x10DC
+#define SSB_SPROM8_CCK2GPO              0x1140  /* CCK power offset */
+#define SSB_SPROM8_OFDM2GPO             0x1142  /* 2.4GHz OFDM power offset */
+#define SSB_SPROM8_OFDM5GPO             0x1146  /* 5.3GHz OFDM power offset */
+#define SSB_SPROM8_OFDM5GLPO            0x114A  /* 5.2GHz OFDM power offset */
+#define SSB_SPROM8_OFDM5GHPO            0x114E  /* 5.8GHz OFDM power offset */
 
 /* Values for SSB_SPROM1_BINF_CCODE */
 enum {