From: Gertjan van Wingerde <gwingerde@gmail.com>
To: users@rt2x00.serialmonkey.com, linux-wireless@vger.kernel.org
Cc: Ivo van Doorn <ivdoorn@gmail.com>,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
Gertjan van Wingerde <gwingerde@gmail.com>
Subject: [PATCH v2] rt2x00: Initialize rf302x RF values properly for rt2800pci.
Date: Tue, 10 Nov 2009 22:42:40 +0100 [thread overview]
Message-ID: <1257889360-388-1-git-send-email-gwingerde@gmail.com> (raw)
Ensure RF302x and RF2020 chipsets are handled properly in rt2800lib for the rt3090 chipset.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
---
Rebased to apply on top of Bart's second series of unification patches.
---
drivers/net/wireless/rt2x00/rt2800lib.c | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index a848cf5..75d3d00 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1,5 +1,6 @@
/*
Copyright (C) 2009 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
+ Copyright (C) 2009 Gertjan van Wingerde <gwingerde@gmail.com>
Based on the original rt2800pci.c and rt2800usb.c.
Copyright (C) 2009 Ivo van Doorn <IvDoorn@gmail.com>
@@ -806,8 +807,9 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
unsigned int tx_pin;
u8 bbp;
- if (rt2x00_rt(&rt2x00dev->chip, RT3070) &&
- (rt2x00_rf(&rt2x00dev->chip, RF2020) ||
+ if ((rt2x00_rt(&rt2x00dev->chip, RT3070) ||
+ rt2x00_rt(&rt2x00dev->chip, RT3090)) &&
+ (rt2x00_rf(&rt2x00dev->chip, RF2020) ||
rt2x00_rf(&rt2x00dev->chip, RF3020) ||
rt2x00_rf(&rt2x00dev->chip, RF3021) ||
rt2x00_rf(&rt2x00dev->chip, RF3022)))
@@ -1989,7 +1991,7 @@ static const struct rf_channel rf_vals[] = {
* RF value list for rt3070
* Supports: 2.4 GHz
*/
-static const struct rf_channel rf_vals_3070[] = {
+static const struct rf_channel rf_vals_302x[] = {
{1, 241, 2, 2 },
{2, 241, 2, 7 },
{3, 242, 2, 2 },
@@ -2046,26 +2048,19 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
if (rt2x00_rf(chip, RF2820) ||
rt2x00_rf(chip, RF2720) ||
- (rt2x00_intf_is_pci(rt2x00dev) &&
- (rt2x00_rf(chip, RF3020) ||
- rt2x00_rf(chip, RF3021) ||
- rt2x00_rf(chip, RF3022) ||
- rt2x00_rf(chip, RF2020) ||
- rt2x00_rf(chip, RF3052)))) {
+ (rt2x00_intf_is_pci(rt2x00dev) && rt2x00_rf(chip, RF3052))) {
spec->num_channels = 14;
spec->channels = rf_vals;
- } else if (rt2x00_rf(chip, RF2850) ||
- rt2x00_rf(chip, RF2750)) {
+ } else if (rt2x00_rf(chip, RF2850) || rt2x00_rf(chip, RF2750)) {
spec->supported_bands |= SUPPORT_BAND_5GHZ;
spec->num_channels = ARRAY_SIZE(rf_vals);
spec->channels = rf_vals;
- } else if (rt2x00_intf_is_usb(rt2x00dev) &&
- (rt2x00_rf(chip, RF3020) ||
- rt2x00_rf(chip, RF2020) ||
- rt2x00_rf(chip, RF3021) ||
- rt2x00_rf(chip, RF3022))) {
- spec->num_channels = ARRAY_SIZE(rf_vals_3070);
- spec->channels = rf_vals_3070;
+ } else if (rt2x00_rf(chip, RF3020) ||
+ rt2x00_rf(chip, RF2020) ||
+ rt2x00_rf(chip, RF3021) ||
+ rt2x00_rf(chip, RF3022)) {
+ spec->num_channels = ARRAY_SIZE(rf_vals_302x);
+ spec->channels = rf_vals_302x;
}
/*
--
1.6.5.2
next reply other threads:[~2009-11-10 21:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-10 21:42 Gertjan van Wingerde [this message]
2009-11-10 21:43 ` [PATCH v2] rt2x00: Initialize rf302x RF values properly for rt2800pci Ivo van Doorn
2009-11-11 6:33 ` Kalle Valo
2009-11-11 14:28 ` John W. Linville
2009-11-11 20:16 ` Gertjan van Wingerde
2009-11-12 19:32 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1257889360-388-1-git-send-email-gwingerde@gmail.com \
--to=gwingerde@gmail.com \
--cc=bzolnier@gmail.com \
--cc=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=users@rt2x00.serialmonkey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).