wl12xx: use frequency instead of enumerations for pdata clocks

Instead of defining an enumeration with the FW specific values for the
different clock rates, use the actual frequency instead.  Also add a
boolean to specify whether the clock is XTAL or not.

Change all board files to reflect this.

Signed-off-by: Luciano Coelho <luca@coelho.fi>
[Eliad - small fixes, update board file changes]
Signed-off-by: Eliad Peller <eliad@wizery.com>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 916589ca8d44..853b941b710e 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1386,7 +1386,8 @@ static const short da850_wl12xx_pins[] __initconst = {
 static struct wl12xx_platform_data da850_wl12xx_wlan_data __initdata = {
         .irq                    = -1,
         .irq_trigger            = IRQ_TYPE_EDGE_RISING,
-        .board_ref_clock        = WL12XX_REFCLOCK_38,
+        .ref_clock_freq         = 38400000,
+        .ref_clock_xtal         = false,
 };
 
 static __init int da850_wl12xx_init(void)
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index e86fb0d55c59..cebdf8d0dc08 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -39,14 +39,14 @@ static struct twl4030_gpio_platform_data twl_gpio_auxdata;
 
 static struct wl12xx_platform_data wl12xx __initdata;
 
-static void __init __used legacy_init_wl12xx(unsigned ref_clock,
-                                             unsigned tcxo_clock,
+static void __init __used legacy_init_wl12xx(u32 ref_clock_freq,
+                                             u32 tcxo_clock_freq,
                                              int gpio)
 {
         int res;
 
-        wl12xx.board_ref_clock = ref_clock;
-        wl12xx.board_tcxo_clock = tcxo_clock;
+        wl12xx.ref_clock_freq = ref_clock_freq;
+        wl12xx.tcxo_clock_freq = tcxo_clock_freq;
         wl12xx.irq = gpio_to_irq(gpio);
         wl12xx.irq_trigger = IRQ_TYPE_LEVEL_HIGH;
 
@@ -57,8 +57,8 @@ static void __init __used legacy_init_wl12xx(unsigned ref_clock,
         }
 }
 #else
-static inline void legacy_init_wl12xx(unsigned ref_clock,
-                                      unsigned tcxo_clock,
+static inline void legacy_init_wl12xx(u32 ref_clock_freq,
+                                      u32 tcxo_clock_freq,
                                       int gpio)
 {
 }
@@ -130,7 +130,7 @@ static void __init omap3_sbc_t3730_twl_init(void)
 static void __init omap3_sbc_t3730_legacy_init(void)
 {
         omap3_sbc_t3x_usb_hub_init(167, "sb-t35 usb hub");
-        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
+        legacy_init_wl12xx(38400000, 0, 136);
 }
 
 static void __init omap3_sbc_t3530_legacy_init(void)
@@ -175,12 +175,12 @@ static void __init omap3_igep0030_rev_g_legacy_init(void)
 static void __init omap3_evm_legacy_init(void)
 {
         hsmmc2_internal_input_clk();
-        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 149);
+        legacy_init_wl12xx(38400000, 0, 149);
 }
 
 static void __init omap3_zoom_legacy_init(void)
 {
-        legacy_init_wl12xx(WL12XX_REFCLOCK_26, 0, 162);
+        legacy_init_wl12xx(26000000, 0, 162);
 }
 
 static void am35xx_enable_emac_int(void)
@@ -247,7 +247,7 @@ static void __init omap3_sbc_t3517_legacy_init(void)
         am35xx_emac_reset();
         hsmmc2_internal_input_clk();
         omap3_sbc_t3517_wifi_init();
-        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 145);
+        legacy_init_wl12xx(38400000, 0, 145);
 }
 
 static void __init am3517_evm_legacy_init(void)
@@ -292,18 +292,17 @@ static void __init omap3_tao3530_legacy_init(void)
 #ifdef CONFIG_ARCH_OMAP4
 static void __init omap4_sdp_legacy_init(void)
 {
-        legacy_init_wl12xx(WL12XX_REFCLOCK_26,
-                           WL12XX_TCXOCLOCK_26, 53);
+        legacy_init_wl12xx(26000000, 26000000, 53);
 }
 
 static void __init omap4_panda_legacy_init(void)
 {
-        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
+        legacy_init_wl12xx(38400000, 0, 53);
 }
 
 static void __init var_som_om44_legacy_init(void)
 {
-        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 41);
+        legacy_init_wl12xx(38400000, 0, 41);
 }
 #endif
 
@@ -318,7 +317,7 @@ static struct iommu_platform_data omap4_iommu_pdata = {
 #ifdef CONFIG_SOC_AM33XX
 static void __init am335x_evmsk_legacy_init(void)
 {
-        legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 31);
+        legacy_init_wl12xx(38400000, 0, 31);
 }
 #endif