| Message ID | 1426162154-8716-3-git-send-email-eliad@wizery.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
* Eliad Peller <eliad@wizery.com> [150312 05:09]: > From: Luciano Coelho <luca@coelho.fi> > > 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. Thanks for doing this. Just one comment on how we're going to get this all merged. Chances are this will cause merge conflicts between the wireless tree and the omap tree for the platform data and dts changes. Can you please separate the wireless changes in this series so we can do this in the following sets: 1. Add support for new things to wireless driver 2. Switch platform code to use the new support 3. Remove support for platform data with a follow-up patch The other option would be to have the whole series in a immutable branch against v3.0-rc1 that can be merged into both wirelss tree and omap tree. Regards, Tony > 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> > --- > arch/arm/mach-davinci/board-da850-evm.c | 3 +- > arch/arm/mach-omap2/pdata-quirks.c | 29 ++++++++-------- > drivers/net/wireless/ti/wl12xx/main.c | 60 ++++++++++++++++++++++++++++++--- > drivers/net/wireless/ti/wl12xx/wl12xx.h | 28 +++++++++++++++ > include/linux/wl12xx.h | 27 ++------------- > 5 files changed, 103 insertions(+), 44 deletions(-) > > diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c > index 916589c..853b941 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 4449f4c..337cc22 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) > @@ -174,12 +174,12 @@ static void __init omap3_igep0030_rev_g_legacy_init(void) > > static void __init omap3_evm_legacy_init(void) > { > - 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) > @@ -246,7 +246,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) > @@ -291,18 +291,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 > > @@ -317,7 +316,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 > > diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c > index 144d1f8..b3f751f 100644 > --- a/drivers/net/wireless/ti/wl12xx/main.c > +++ b/drivers/net/wireless/ti/wl12xx/main.c > @@ -1770,6 +1770,40 @@ wl12xx_iface_combinations[] = { > }, > }; > > +static const struct wl12xx_clock wl12xx_refclock_table[] = { > + { 19200000, false, WL12XX_REFCLOCK_19 }, > + { 26000000, false, WL12XX_REFCLOCK_26 }, > + { 26000000, true, WL12XX_REFCLOCK_26_XTAL }, > + { 38400000, false, WL12XX_REFCLOCK_38 }, > + { 38400000, true, WL12XX_REFCLOCK_38_XTAL }, > + { 52000000, false, WL12XX_REFCLOCK_52 }, > + { 0, false, 0 } > +}; > + > +static const struct wl12xx_clock wl12xx_tcxoclock_table[] = { > + { 16368000, true, WL12XX_TCXOCLOCK_16_368 }, > + { 16800000, true, WL12XX_TCXOCLOCK_16_8 }, > + { 19200000, true, WL12XX_TCXOCLOCK_19_2 }, > + { 26000000, true, WL12XX_TCXOCLOCK_26 }, > + { 32736000, true, WL12XX_TCXOCLOCK_32_736 }, > + { 33600000, true, WL12XX_TCXOCLOCK_33_6 }, > + { 38400000, true, WL12XX_TCXOCLOCK_38_4 }, > + { 52000000, true, WL12XX_TCXOCLOCK_52 }, > + { 0, false, 0 } > +}; > + > +static int wl12xx_get_clock_idx(const struct wl12xx_clock *table, > + u32 freq, bool xtal) > +{ > + int i; > + > + for (i = 0; table[i].freq != 0; i++) > + if ((table[i].freq == freq) && (table[i].xtal == xtal)) > + return table[i].hw_idx; > + > + return -EINVAL; > +} > + > static int wl12xx_setup(struct wl1271 *wl) > { > struct wl12xx_priv *priv = wl->priv; > @@ -1799,7 +1833,17 @@ static int wl12xx_setup(struct wl1271 *wl) > wl12xx_conf_init(wl); > > if (!fref_param) { > - priv->ref_clock = pdata->board_ref_clock; > + priv->ref_clock = wl12xx_get_clock_idx(wl12xx_refclock_table, > + pdata->ref_clock_freq, > + pdata->ref_clock_xtal); > + if (priv->ref_clock < 0) { > + wl1271_error("Invalid ref_clock frequency (%d Hz, %s)", > + pdata->ref_clock_freq, > + pdata->ref_clock_xtal ? > + "XTAL" : "not XTAL"); > + > + return priv->ref_clock; > + } > } else { > if (!strcmp(fref_param, "19.2")) > priv->ref_clock = WL12XX_REFCLOCK_19; > @@ -1817,9 +1861,17 @@ static int wl12xx_setup(struct wl1271 *wl) > wl1271_error("Invalid fref parameter %s", fref_param); > } > > - if (!tcxo_param) { > - priv->tcxo_clock = pdata->board_tcxo_clock; > - } else { > + if (!tcxo_param && pdata->tcxo_clock_freq) { > + priv->tcxo_clock = wl12xx_get_clock_idx(wl12xx_tcxoclock_table, > + pdata->tcxo_clock_freq, > + true); > + if (priv->tcxo_clock < 0) { > + wl1271_error("Invalid tcxo_clock frequency (%d Hz)", > + pdata->tcxo_clock_freq); > + > + return priv->tcxo_clock; > + } > + } else if (tcxo_param) { > if (!strcmp(tcxo_param, "19.2")) > priv->tcxo_clock = WL12XX_TCXOCLOCK_19_2; > else if (!strcmp(tcxo_param, "26")) > diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h > index 75c9265..5952e99a 100644 > --- a/drivers/net/wireless/ti/wl12xx/wl12xx.h > +++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h > @@ -82,6 +82,34 @@ struct wl12xx_priv { > struct wl127x_rx_mem_pool_addr *rx_mem_addr; > }; > > +/* 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 wl12xx_clock { > + u32 freq; > + bool xtal; > + u8 hw_idx; > +}; > + > struct wl12xx_fw_packet_counters { > /* Cumulative counter of released packets per AC */ > u8 tx_released_pkts[NUM_TX_QUEUES]; > diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h > index 3876b67..eea1e6d 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 */ > @@ -58,8 +36,9 @@ struct wl1251_platform_data { > struct wl12xx_platform_data { > int irq; > u32 irq_trigger; > - int board_ref_clock; > - int board_tcxo_clock; > + bool ref_clock_xtal; /* specify whether the clock is XTAL or not */ > + u32 ref_clock_freq; /* in Hertz */ > + u32 tcxo_clock_freq; /* in Hertz, tcxo is always XTAL */ > bool pwr_in_suspend; > }; > > -- > 1.8.5.2.229.g4448466.dirty > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
+Kalle On Fri, Mar 13, 2015 at 5:00 PM, Tony Lindgren <tony@atomide.com> wrote: > * Eliad Peller <eliad@wizery.com> [150312 05:09]: >> From: Luciano Coelho <luca@coelho.fi> >> >> 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. > > Thanks for doing this. Just one comment on how we're going to get this > all merged. Chances are this will cause merge conflicts between the > wireless tree and the omap tree for the platform data and dts changes. > > Can you please separate the wireless changes in this series so we can > do this in the following sets: > > 1. Add support for new things to wireless driver > > 2. Switch platform code to use the new support > > 3. Remove support for platform data with a follow-up patch > the series will still be dependent on each other (e.g. (3) must come only after (2) was applied), so i'm not sure that will be very helpful? > The other option would be to have the whole series in a immutable > branch against v3.0-rc1 that can be merged into both wirelss tree > and omap tree. > i think that could be easier. or maybe you can just take them all through the omap tree? the wlcore tree is not under active development, so i don't expect conflicts there. Eliad. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sunday 15 March 2015 10:43:35 Eliad Peller wrote: > > > The other option would be to have the whole series in a immutable > > branch against v3.0-rc1 that can be merged into both wirelss tree > > and omap tree. > > > i think that could be easier. > > or maybe you can just take them all through the omap tree? the wlcore > tree is not under active development, so i don't expect conflicts > there. I'm fine with both these approaches. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Arnd Bergmann <arnd@arndb.de> writes: > On Sunday 15 March 2015 10:43:35 Eliad Peller wrote: >> >> > The other option would be to have the whole series in a immutable >> > branch against v3.0-rc1 that can be merged into both wirelss tree >> > and omap tree. >> > >> i think that could be easier. >> >> or maybe you can just take them all through the omap tree? the wlcore >> tree is not under active development, so i don't expect conflicts >> there. > > I'm fine with both these approaches. I prefer these going through the omap tree. Like Eliad said, drivers/net/wireless/ti does not get that many changes nowadays so the chances of this patchset conflicting with something is very small.
* Kalle Valo <kvalo@codeaurora.org> [150315 23:50]: > Arnd Bergmann <arnd@arndb.de> writes: > > > On Sunday 15 March 2015 10:43:35 Eliad Peller wrote: > >> > >> > The other option would be to have the whole series in a immutable > >> > branch against v3.0-rc1 that can be merged into both wirelss tree > >> > and omap tree. > >> > > >> i think that could be easier. > >> > >> or maybe you can just take them all through the omap tree? the wlcore > >> tree is not under active development, so i don't expect conflicts > >> there. > > > > I'm fine with both these approaches. > > I prefer these going through the omap tree. Like Eliad said, > drivers/net/wireless/ti does not get that many changes nowadays so the > chances of this patchset conflicting with something is very small. OK great. In that case no need to rearrange the patches, I can apply them into an immutable branch once the pending issues have been fixed if Kalle acks them. To avoid merge conflicts that branch is easiest done against v4.0-rc4. Kalle and Arnd, does that work for you guys? I can also base it on 5b7610f23562 ("ARM: OMAP2+: Fix wl12xx on dm3730-evm with mainline u-boot") that's on top of -rc2 plus few other fixes now merged to -rc4 mainline if we need a branch based on an earlier tag. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren <tony@atomide.com> writes: >> I prefer these going through the omap tree. Like Eliad said, >> drivers/net/wireless/ti does not get that many changes nowadays so the >> chances of this patchset conflicting with something is very small. > > OK great. In that case no need to rearrange the patches, I can > apply them into an immutable branch once the pending issues have > been fixed if Kalle acks them. > > To avoid merge conflicts that branch is easiest done against > v4.0-rc4. Kalle and Arnd, does that work for you guys? > > I can also base it on 5b7610f23562 ("ARM: OMAP2+: Fix wl12xx on > dm3730-evm with mainline u-boot") that's on top of -rc2 plus few > other fixes now merged to -rc4 mainline if we need a branch based > on an earlier tag. Sorry, it seems I forgot to answer this one: Either baseline is good for me, I can't think of any problems with either one. But please do remember that I'm a new maintainer, I might very well miss something ;)
* Kalle Valo <kvalo@codeaurora.org> [150320 07:01]: > Tony Lindgren <tony@atomide.com> writes: > > >> I prefer these going through the omap tree. Like Eliad said, > >> drivers/net/wireless/ti does not get that many changes nowadays so the > >> chances of this patchset conflicting with something is very small. > > > > OK great. In that case no need to rearrange the patches, I can > > apply them into an immutable branch once the pending issues have > > been fixed if Kalle acks them. > > > > To avoid merge conflicts that branch is easiest done against > > v4.0-rc4. Kalle and Arnd, does that work for you guys? > > > > I can also base it on 5b7610f23562 ("ARM: OMAP2+: Fix wl12xx on > > dm3730-evm with mainline u-boot") that's on top of -rc2 plus few > > other fixes now merged to -rc4 mainline if we need a branch based > > on an earlier tag. > > Sorry, it seems I forgot to answer this one: > > Either baseline is good for me, I can't think of any problems with > either one. But please do remember that I'm a new maintainer, I might > very well miss something ;) OK, I'll base it on -rc4 unless Arnd needs something earlier. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 916589c..853b941 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 4449f4c..337cc22 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) @@ -174,12 +174,12 @@ static void __init omap3_igep0030_rev_g_legacy_init(void) static void __init omap3_evm_legacy_init(void) { - 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) @@ -246,7 +246,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) @@ -291,18 +291,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 @@ -317,7 +316,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 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c index 144d1f8..b3f751f 100644 --- a/drivers/net/wireless/ti/wl12xx/main.c +++ b/drivers/net/wireless/ti/wl12xx/main.c @@ -1770,6 +1770,40 @@ wl12xx_iface_combinations[] = { }, }; +static const struct wl12xx_clock wl12xx_refclock_table[] = { + { 19200000, false, WL12XX_REFCLOCK_19 }, + { 26000000, false, WL12XX_REFCLOCK_26 }, + { 26000000, true, WL12XX_REFCLOCK_26_XTAL }, + { 38400000, false, WL12XX_REFCLOCK_38 }, + { 38400000, true, WL12XX_REFCLOCK_38_XTAL }, + { 52000000, false, WL12XX_REFCLOCK_52 }, + { 0, false, 0 } +}; + +static const struct wl12xx_clock wl12xx_tcxoclock_table[] = { + { 16368000, true, WL12XX_TCXOCLOCK_16_368 }, + { 16800000, true, WL12XX_TCXOCLOCK_16_8 }, + { 19200000, true, WL12XX_TCXOCLOCK_19_2 }, + { 26000000, true, WL12XX_TCXOCLOCK_26 }, + { 32736000, true, WL12XX_TCXOCLOCK_32_736 }, + { 33600000, true, WL12XX_TCXOCLOCK_33_6 }, + { 38400000, true, WL12XX_TCXOCLOCK_38_4 }, + { 52000000, true, WL12XX_TCXOCLOCK_52 }, + { 0, false, 0 } +}; + +static int wl12xx_get_clock_idx(const struct wl12xx_clock *table, + u32 freq, bool xtal) +{ + int i; + + for (i = 0; table[i].freq != 0; i++) + if ((table[i].freq == freq) && (table[i].xtal == xtal)) + return table[i].hw_idx; + + return -EINVAL; +} + static int wl12xx_setup(struct wl1271 *wl) { struct wl12xx_priv *priv = wl->priv; @@ -1799,7 +1833,17 @@ static int wl12xx_setup(struct wl1271 *wl) wl12xx_conf_init(wl); if (!fref_param) { - priv->ref_clock = pdata->board_ref_clock; + priv->ref_clock = wl12xx_get_clock_idx(wl12xx_refclock_table, + pdata->ref_clock_freq, + pdata->ref_clock_xtal); + if (priv->ref_clock < 0) { + wl1271_error("Invalid ref_clock frequency (%d Hz, %s)", + pdata->ref_clock_freq, + pdata->ref_clock_xtal ? + "XTAL" : "not XTAL"); + + return priv->ref_clock; + } } else { if (!strcmp(fref_param, "19.2")) priv->ref_clock = WL12XX_REFCLOCK_19; @@ -1817,9 +1861,17 @@ static int wl12xx_setup(struct wl1271 *wl) wl1271_error("Invalid fref parameter %s", fref_param); } - if (!tcxo_param) { - priv->tcxo_clock = pdata->board_tcxo_clock; - } else { + if (!tcxo_param && pdata->tcxo_clock_freq) { + priv->tcxo_clock = wl12xx_get_clock_idx(wl12xx_tcxoclock_table, + pdata->tcxo_clock_freq, + true); + if (priv->tcxo_clock < 0) { + wl1271_error("Invalid tcxo_clock frequency (%d Hz)", + pdata->tcxo_clock_freq); + + return priv->tcxo_clock; + } + } else if (tcxo_param) { if (!strcmp(tcxo_param, "19.2")) priv->tcxo_clock = WL12XX_TCXOCLOCK_19_2; else if (!strcmp(tcxo_param, "26")) diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h index 75c9265..5952e99a 100644 --- a/drivers/net/wireless/ti/wl12xx/wl12xx.h +++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h @@ -82,6 +82,34 @@ struct wl12xx_priv { struct wl127x_rx_mem_pool_addr *rx_mem_addr; }; +/* 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 wl12xx_clock { + u32 freq; + bool xtal; + u8 hw_idx; +}; + struct wl12xx_fw_packet_counters { /* Cumulative counter of released packets per AC */ u8 tx_released_pkts[NUM_TX_QUEUES]; diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 3876b67..eea1e6d 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 */ @@ -58,8 +36,9 @@ struct wl1251_platform_data { struct wl12xx_platform_data { int irq; u32 irq_trigger; - int board_ref_clock; - int board_tcxo_clock; + bool ref_clock_xtal; /* specify whether the clock is XTAL or not */ + u32 ref_clock_freq; /* in Hertz */ + u32 tcxo_clock_freq; /* in Hertz, tcxo is always XTAL */ bool pwr_in_suspend; };