Merge tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "wireless wl12xx and omap device tree changes for v4.1" from Tony
Lindgren:

Wireless and omap changes to make wl12xx driver to use device tree
data instead of platform data from Eliad Peller <eliad@wizery.com>:

- Add device-tree support to the wlcore (wl12xx/wl18xx) driver.

- Update the current users to use the bindings instead of pdata-quirks.

- Finally, remove the deprecated wl12xx_platform_data struct

Note that da850 board file code that still uses the platform data,
but we have da850.dtsi that can be used instead. So it was decided
that we should try to remove the wl12xx support from the da850
board file as suggested by Sekhar Nori <nsekhar@ti.com>. As it's
the last patch in the series, the last patch can be simply reverted
if needed.

As this series touches quite a bit of arch code, it was suggested
by Kalle Valo <kvalo@codeaurora.org> that the whole series should
be merged via the arm-soc tree.

* tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  wlcore: remove wl12xx_platform_data
  ARM: dts: add wl12xx/wl18xx bindings
  wlcore: add device-tree support
  dt: bindings: add TI's wilink wireless device
  wl12xx: use frequency instead of enumerations for pdata clocks
  wlcore: set irq_trigger in board files instead of hiding behind a quirk
  + Linux 4.0-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 0 insertions, 49 deletions

diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index a9c723be1acf..95704cd4cfab 100644
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -26,28 +26,6 @@
 
 #include <linux/err.h>
 
-/* Reference clock values */
-enum {
-        WL12XX_REFCLOCK_19      = 0, /* 19.2 MHz */
-        WL12XX_REFCLOCK_26      = 1, /* 26 MHz */
-        WL12XX_REFCLOCK_38      = 2, /* 38.4 MHz */
-        WL12XX_REFCLOCK_52      = 3, /* 52 MHz */
-        WL12XX_REFCLOCK_38_XTAL = 4, /* 38.4 MHz, XTAL */
-        WL12XX_REFCLOCK_26_XTAL = 5, /* 26 MHz, XTAL */
-};
-
-/* TCXO clock values */
-enum {
-        WL12XX_TCXOCLOCK_19_2   = 0, /* 19.2MHz */
-        WL12XX_TCXOCLOCK_26     = 1, /* 26 MHz */
-        WL12XX_TCXOCLOCK_38_4   = 2, /* 38.4MHz */
-        WL12XX_TCXOCLOCK_52     = 3, /* 52 MHz */
-        WL12XX_TCXOCLOCK_16_368 = 4, /* 16.368 MHz */
-        WL12XX_TCXOCLOCK_32_736 = 5, /* 32.736 MHz */
-        WL12XX_TCXOCLOCK_16_8   = 6, /* 16.8 MHz */
-        WL12XX_TCXOCLOCK_33_6   = 7, /* 33.6 MHz */
-};
-
 struct wl1251_platform_data {
         int power_gpio;
         /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
@@ -55,23 +33,8 @@ struct wl1251_platform_data {
         bool use_eeprom;
 };
 
-struct wl12xx_platform_data {
-        int irq;
-        int board_ref_clock;
-        int board_tcxo_clock;
-        unsigned long platform_quirks;
-        bool pwr_in_suspend;
-};
-
-/* Platform does not support level trigger interrupts */
-#define WL12XX_PLATFORM_QUIRK_EDGE_IRQ  BIT(0)
-
 #ifdef CONFIG_WILINK_PLATFORM_DATA
 
-int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
-
-struct wl12xx_platform_data *wl12xx_get_platform_data(void);
-
 int wl1251_set_platform_data(const struct wl1251_platform_data *data);
 
 struct wl1251_platform_data *wl1251_get_platform_data(void);
@@ -79,18 +42,6 @@ struct wl1251_platform_data *wl1251_get_platform_data(void);
 #else
 
 static inline
-int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
-{
-        return -ENOSYS;
-}
-
-static inline
-struct wl12xx_platform_data *wl12xx_get_platform_data(void)
-{
-        return ERR_PTR(-ENODATA);
-}
-
-static inline
 int wl1251_set_platform_data(const struct wl1251_platform_data *data)
 {
         return -ENOSYS;