Merge remote-tracking branch 'wireless-next/master' into HEAD

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2 files changed, 82 insertions, 0 deletions

diff --git a/include/linux/platform_data/net-cw1200.h b/include/linux/platform_data/net-cw1200.h
new file mode 100644
index 000000000000..c6fbc3ce4ab0
--- /dev/null
+++ b/include/linux/platform_data/net-cw1200.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011
+ *
+ * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef CW1200_PLAT_H_INCLUDED
+#define CW1200_PLAT_H_INCLUDED
+
+struct cw1200_platform_data_spi {
+        u8 spi_bits_per_word;           /* REQUIRED */
+        u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+        /* All others are optional */
+        bool have_5ghz;
+        int reset;                     /* GPIO to RSTn signal (0 disables) */
+        int powerup;                   /* GPIO to POWERUP signal (0 disables) */
+        int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                          bool enable); /* Control 3v3 / 1v8 supply */
+        int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                        bool enable); /* Control CLK32K */
+        const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+        const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+struct cw1200_platform_data_sdio {
+        u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+        /* All others are optional */
+        bool have_5ghz;
+        bool no_nptb;       /* SDIO hardware does not support non-power-of-2-blocksizes */
+        int reset;          /* GPIO to RSTn signal (0 disables) */
+        int powerup;        /* GPIO to POWERUP signal (0 disables) */
+        int irq;            /* IRQ line or 0 to use SDIO IRQ */
+        int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                          bool enable); /* Control 3v3 / 1v8 supply */
+        int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                        bool enable); /* Control CLK32K */
+        const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+        const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+
+/* An example of SPI support in your board setup file:
+
+   static struct cw1200_platform_data_spi cw1200_platform_data = {
+       .ref_clk = 38400,
+       .spi_bits_per_word = 16,
+       .reset = GPIO_RF_RESET,
+       .powerup = GPIO_RF_POWERUP,
+       .macaddr = wifi_mac_addr,
+       .sdd_file = "sdd_sagrad_1091_1098.bin",
+  };
+  static struct spi_board_info myboard_spi_devices[] __initdata = {
+       {
+               .modalias = "cw1200_wlan_spi",
+               .max_speed_hz = 52000000,
+               .bus_num = 0,
+               .irq = WIFI_IRQ,
+               .platform_data = &cw1200_platform_data,
+               .chip_select = 0,
+       },
+  };
+
+ */
+
+/* An example of SDIO support in your board setup file:
+
+  static struct cw1200_platform_data_sdio my_cw1200_platform_data = {
+        .ref_clk = 38400,
+        .have_5ghz = false,
+        .sdd_file = "sdd_myplatform.bin",
+  };
+  cw1200_sdio_set_platform_data(&my_cw1200_platform_data);
+
+ */
+
+void __init cw1200_sdio_set_platform_data(struct cw1200_platform_data_sdio *pdata);
+
+#endif /* CW1200_PLAT_H_INCLUDED */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 3a7256955b10..f9f931c89e3e 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -172,6 +172,7 @@
 #define SSB_SPROMSIZE_WORDS_R4          220
 #define SSB_SPROMSIZE_BYTES_R123        (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
 #define SSB_SPROMSIZE_BYTES_R4          (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
+#define SSB_SPROMSIZE_WORDS_R10         230
 #define SSB_SPROM_BASE1                 0x1000
 #define SSB_SPROM_BASE31                0x0800
 #define SSB_SPROM_REVISION              0x007E