* Re: [PATCH v2 13/14] rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal [not found] ` <20170118142958.GA14573@redhat.com> @ 2017-01-19 13:30 ` Daniel Golle 2017-01-19 13:30 ` Daniel Golle 2017-01-19 20:52 ` Daniel Golle 0 siblings, 2 replies; 3+ messages in thread From: Daniel Golle @ 2017-01-19 13:30 UTC (permalink / raw) To: Stanislaw Gruszka Cc: linux-mips, linux-wireless, michel.stempin, Kalle Valo, Felix Fietkau, John Crispin, Gabor Juhos Hi Stanislaw, On Wed, Jan 18, 2017 at 03:30:02PM +0100, Stanislaw Gruszka wrote: > On Mon, Jan 16, 2017 at 04:15:56AM +0100, Daniel Golle wrote: > > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > > Signed-off-by: Mathias Kresin <dev@kresin.me> > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > > --- > > drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 50 +++++++++++++++++++++++++- > > drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++ > > 2 files changed, 51 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > index 93c97eade334..cb1457595f05 100644 > > --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > @@ -36,6 +36,7 @@ > > #include <linux/kernel.h> > > #include <linux/module.h> > > #include <linux/slab.h> > > +#include <linux/clk.h> > > > > #include "rt2x00.h" > > #include "rt2800lib.h" > > @@ -7675,6 +7676,27 @@ static const struct rf_channel rf_vals_5592_xtal40[] = { > > {196, 83, 0, 12, 1}, > > }; > > > > +/* > > + * RF value list for rt3xxx with Xtal20MHz > > + * Supports: 2.4 GHz (all) (RF3322) > > + */ > > +static const struct rf_channel rf_vals_xtal20mhz_3x[] = { > Please locate this values in alphabetical order (i.e. after _3x and > before _5592 ). Sure, sorry, that ended up in the wrong order when rebase the patches. > > > struct hw_mode_spec *spec = &rt2x00dev->spec; > > @@ -7764,7 +7786,10 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > > case RF5390: > > case RF5392: > > spec->num_channels = 14; > > - spec->channels = rf_vals_3x; > > + if (spec->clk_is_20mhz) > > + spec->channels = rf_vals_xtal20mhz_3x; > > + else > > + spec->channels = rf_vals_3x; > > break; > > How does vendor drivers recognize xtal (I assume rf_vals_xtal20mhz_3x > values were taken from vendor driver) ? It should be possible to get > clock frequency from device register like is is done on RF5592, without > adding additional clock recognition code. But if such code is needed > I prefer that low level board/platform routines do it and place clock > frequency for rt2x00 in rt2x00dev->dev->platform_data. Recent vendor drivers probe the clock by reading a SYSCTL register: --- // Programming channel parameters Value = (*((volatile u32 *)(RALINK_SYSCTL_BASE + 0x10))); if(Value & (1<<20)) { //Xtal=40M RT30xxWriteRFRegister(pAd, RF_R08, FreqItems3020[index].N); RT30xxWriteRFRegister(pAd, RF_R09, FreqItems3020[index].K); }else { RT30xxWriteRFRegister(pAd, RF_R08, FreqItems3020_Xtal20M[index].N); RT30xxWriteRFRegister(pAd, RF_R09, FreqItems3020_Xtal20M[index].K); } --- From what I can see, most other drivers which need to touch SYSCTL currently do that by defining a local precompiler macro: --- #ifdef CONFIG_SOC_MT7621 #define RALINK_SYSCTL_BASE 0xbe000000 #else #define RALINK_SYSCTL_BASE 0xb0000000 #endif --- That's obviously not very elegant and probably we should define SYSCTL in the device tree of each SoC and we should write/adapt a syscon mfd driver which other drivers may then use to read/write stuff to/from SYSCTL. The clock could then be provided by a clk driver sitting on top of that and rt2x00 would use that clock. In the meantime, why not just define a static clock in the device-tree and already have rt2x00 consume that clock? That would already be the way things will most likely look like from rt2x00 point of view once syscon and clk drivers are in place. Cheers Daniel ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 13/14] rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal 2017-01-19 13:30 ` [PATCH v2 13/14] rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal Daniel Golle @ 2017-01-19 13:30 ` Daniel Golle 2017-01-19 20:52 ` Daniel Golle 1 sibling, 0 replies; 3+ messages in thread From: Daniel Golle @ 2017-01-19 13:30 UTC (permalink / raw) To: Stanislaw Gruszka Cc: linux-mips, linux-wireless, michel.stempin, Kalle Valo, Felix Fietkau, John Crispin, Gabor Juhos Hi Stanislaw, On Wed, Jan 18, 2017 at 03:30:02PM +0100, Stanislaw Gruszka wrote: > On Mon, Jan 16, 2017 at 04:15:56AM +0100, Daniel Golle wrote: > > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > > Signed-off-by: Mathias Kresin <dev@kresin.me> > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > > --- > > drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 50 +++++++++++++++++++++++++- > > drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++ > > 2 files changed, 51 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > index 93c97eade334..cb1457595f05 100644 > > --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > @@ -36,6 +36,7 @@ > > #include <linux/kernel.h> > > #include <linux/module.h> > > #include <linux/slab.h> > > +#include <linux/clk.h> > > > > #include "rt2x00.h" > > #include "rt2800lib.h" > > @@ -7675,6 +7676,27 @@ static const struct rf_channel rf_vals_5592_xtal40[] = { > > {196, 83, 0, 12, 1}, > > }; > > > > +/* > > + * RF value list for rt3xxx with Xtal20MHz > > + * Supports: 2.4 GHz (all) (RF3322) > > + */ > > +static const struct rf_channel rf_vals_xtal20mhz_3x[] = { > Please locate this values in alphabetical order (i.e. after _3x and > before _5592 ). Sure, sorry, that ended up in the wrong order when rebase the patches. > > > struct hw_mode_spec *spec = &rt2x00dev->spec; > > @@ -7764,7 +7786,10 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > > case RF5390: > > case RF5392: > > spec->num_channels = 14; > > - spec->channels = rf_vals_3x; > > + if (spec->clk_is_20mhz) > > + spec->channels = rf_vals_xtal20mhz_3x; > > + else > > + spec->channels = rf_vals_3x; > > break; > > How does vendor drivers recognize xtal (I assume rf_vals_xtal20mhz_3x > values were taken from vendor driver) ? It should be possible to get > clock frequency from device register like is is done on RF5592, without > adding additional clock recognition code. But if such code is needed > I prefer that low level board/platform routines do it and place clock > frequency for rt2x00 in rt2x00dev->dev->platform_data. Recent vendor drivers probe the clock by reading a SYSCTL register: --- // Programming channel parameters Value = (*((volatile u32 *)(RALINK_SYSCTL_BASE + 0x10))); if(Value & (1<<20)) { //Xtal=40M RT30xxWriteRFRegister(pAd, RF_R08, FreqItems3020[index].N); RT30xxWriteRFRegister(pAd, RF_R09, FreqItems3020[index].K); }else { RT30xxWriteRFRegister(pAd, RF_R08, FreqItems3020_Xtal20M[index].N); RT30xxWriteRFRegister(pAd, RF_R09, FreqItems3020_Xtal20M[index].K); } --- ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 13/14] rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal 2017-01-19 13:30 ` [PATCH v2 13/14] rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal Daniel Golle 2017-01-19 13:30 ` Daniel Golle @ 2017-01-19 20:52 ` Daniel Golle 1 sibling, 0 replies; 3+ messages in thread From: Daniel Golle @ 2017-01-19 20:52 UTC (permalink / raw) To: Stanislaw Gruszka Cc: linux-mips, linux-wireless, michel.stempin, Kalle Valo, Felix Fietkau, John Crispin, Gabor Juhos On Thu, Jan 19, 2017 at 02:30:14PM +0100, Daniel Golle wrote: > Hi Stanislaw, > > On Wed, Jan 18, 2017 at 03:30:02PM +0100, Stanislaw Gruszka wrote: > > On Mon, Jan 16, 2017 at 04:15:56AM +0100, Daniel Golle wrote: > > > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > > > Signed-off-by: Mathias Kresin <dev@kresin.me> > > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > > > --- > > > drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 50 +++++++++++++++++++++++++- > > > drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++ > > > 2 files changed, 51 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > > index 93c97eade334..cb1457595f05 100644 > > > --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > > +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c > > > @@ -36,6 +36,7 @@ > > > #include <linux/kernel.h> > > > #include <linux/module.h> > > > #include <linux/slab.h> > > > +#include <linux/clk.h> > > > > > > #include "rt2x00.h" > > > #include "rt2800lib.h" > > > @@ -7675,6 +7676,27 @@ static const struct rf_channel rf_vals_5592_xtal40[] = { > > > {196, 83, 0, 12, 1}, > > > }; > > > > > > +/* > > > + * RF value list for rt3xxx with Xtal20MHz > > > + * Supports: 2.4 GHz (all) (RF3322) > > > + */ > > > +static const struct rf_channel rf_vals_xtal20mhz_3x[] = { > > Please locate this values in alphabetical order (i.e. after _3x and > > before _5592 ). > > Sure, sorry, that ended up in the wrong order when rebase the patches. > > > > > > struct hw_mode_spec *spec = &rt2x00dev->spec; > > > @@ -7764,7 +7786,10 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > > > case RF5390: > > > case RF5392: > > > spec->num_channels = 14; > > > - spec->channels = rf_vals_3x; > > > + if (spec->clk_is_20mhz) > > > + spec->channels = rf_vals_xtal20mhz_3x; > > > + else > > > + spec->channels = rf_vals_3x; > > > break; > > > > How does vendor drivers recognize xtal (I assume rf_vals_xtal20mhz_3x > > values were taken from vendor driver) ? It should be possible to get > > clock frequency from device register like is is done on RF5592, without > > adding additional clock recognition code. But if such code is needed > > I prefer that low level board/platform routines do it and place clock > > frequency for rt2x00 in rt2x00dev->dev->platform_data. I researched and found this has already been implemented in the ramips platform code, see https://git.kernel.org/cgit/linux/kernel/git/kvalo/wireless-drivers-next.git/tree/arch/mips/ralink/rt305x.c#n194 The patch submitted uses this existing infrastructure which *does* auto-probe the clock from the SoC's SYSCTRL register. I'll re-submit a v3 with the alphabetic order above fixed, ok? Cheers Daniel ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-19 20:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <874m114lwq.fsf@codeaurora.org>
[not found] ` <20170116031541.GA32313@makrotopia.org>
[not found] ` <20170118142958.GA14573@redhat.com>
2017-01-19 13:30 ` [PATCH v2 13/14] rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal Daniel Golle
2017-01-19 13:30 ` Daniel Golle
2017-01-19 20:52 ` Daniel Golle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).