From: "Arend van Spriel" <arend@broadcom.com>
To: linux-wireless <linux-wireless@vger.kernel.org>
Cc: "Arend van Spriel" <arend@broadcom.com>,
"David Herrmann" <dh.herrmann@gmail.com>,
"Maximilian Engelhardt" <maxi@daemonizer.de>,
"David Costa" <david@zarel.net>
Subject: [RFT V2 04/13] brcmsmac: add switch control table for BCM4313 iPA BT-combo cards
Date: Tue, 13 Aug 2013 22:03:31 +0200 [thread overview]
Message-ID: <1376424220-10765-5-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1376424220-10765-1-git-send-email-arend@broadcom.com>
The bcm4313 iPA BT-WLAN combo cards need to be initialized with
a different switch control table. This patch adds that table.
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Maximilian Engelhardt <maxi@daemonizer.de>
Cc: David Costa <david@zarel.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
.../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c | 72 ++++++++++++++++++++
.../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h | 1 +
2 files changed, 73 insertions(+)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
index deae3a7..36c41df 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
@@ -2044,6 +2044,73 @@ static const u16 dot11lcn_sw_ctrl_tbl_4313_rev0[] = {
0x0005,
};
+static const u16 dot11lcn_sw_ctrl_tbl_4313_ipa_rev0_combo[] = {
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+ 0x0005,
+ 0x0006,
+ 0x0009,
+ 0x000a,
+};
+
static const u16 dot11lcn_sw_ctrl_tbl_rev0[] = {
0x0004,
0x0004,
@@ -2808,6 +2875,11 @@ const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313 = {
ARRAY_SIZE(dot11lcn_sw_ctrl_tbl_4313_rev0), 15, 0, 16
};
+const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_bt_ipa = {
+ &dot11lcn_sw_ctrl_tbl_4313_ipa_rev0_combo,
+ ARRAY_SIZE(dot11lcn_sw_ctrl_tbl_4313_ipa_rev0_combo), 15, 0, 16
+};
+
const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_epa = {
&dot11lcn_sw_ctrl_tbl_4313_epa_rev0,
ARRAY_SIZE(dot11lcn_sw_ctrl_tbl_4313_epa_rev0), 15, 0, 16
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
index 5f75e16..489422a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
@@ -20,6 +20,7 @@
extern const struct phytbl_info dot11lcnphytbl_rx_gain_info_rev0[];
extern const u32 dot11lcnphytbl_rx_gain_info_sz_rev0;
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313;
+extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_bt_ipa;
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_epa;
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_epa_combo;
extern const struct phytbl_info dot11lcn_sw_ctrl_tbl_info_4313_bt_epa;
--
1.7.10.4
next prev parent reply other threads:[~2013-08-13 20:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 20:03 [RFT 00/13] brcmsmac: bcm4313 iPA related patches Arend van Spriel
2013-08-13 20:03 ` [RFT V2 01/13] brcmsmac: cosmetic change in phy_lcn.c Arend van Spriel
2013-08-13 20:03 ` [RFT V2 02/13] brcmsmac: change pa_gain for bcm4313 iPA Arend van Spriel
2013-08-21 19:18 ` Hauke Mehrtens
2013-08-22 8:08 ` Arend van Spriel
2013-08-13 20:03 ` [RFT V2 03/13] brcmsmac: use ARRAY_SIZE in phytbl_lcn.c Arend van Spriel
2013-08-13 20:03 ` Arend van Spriel [this message]
2013-08-13 20:03 ` [RFT V2 05/13] brcmsmac: add debug info message providing phy and radio info Arend van Spriel
2013-08-13 20:03 ` [RFT V2 06/13] brcmsmac: update transmit gain table for lcn phy Arend van Spriel
2013-08-13 20:03 ` [RFT V2 07/13] brcmsmac: change lcnphy receive i/q calibration routine Arend van Spriel
2013-08-13 20:03 ` [RFT V2 08/13] brcmsmac: fix TSSI idle estimation Arend van Spriel
2013-08-13 20:03 ` [RFT V2 09/13] brcmsmac: avoid calling set_txpwr_by_index() twice Arend van Spriel
2013-08-13 20:03 ` [RFT V2 10/13] brcmsmac: rework switch control table init including iPA BT-combo Arend van Spriel
2013-08-13 20:03 ` [RFT V2 11/13] brcmsmac: correct phy registers for TSSI-based power control Arend van Spriel
2013-08-13 20:03 ` [RFT V2 12/13] brcmsmac: reinitialize TSSI power control upon channel switch Arend van Spriel
2013-08-13 20:03 ` [RFT V2 13/13] brcmsmac: add support for BCM4313 iPA variant Arend van Spriel
2013-08-13 20:09 ` [RFT 00/13] brcmsmac: bcm4313 iPA related patches David Herrmann
2013-08-13 20:46 ` Arend van Spriel
2013-08-14 10:33 ` David Herrmann
2013-08-14 18:16 ` Arend van Spriel
2013-08-21 16:17 ` Maximilian Engelhardt
2013-08-21 19:00 ` Arend van Spriel
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=1376424220-10765-5-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=david@zarel.net \
--cc=dh.herrmann@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=maxi@daemonizer.de \
/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).