From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
To: <linville@tuxdriver.com>
Cc: <linux-wireless@vger.kernel.org>,
Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Subject: [PATCH 05/10] ath9k_hw: add AR9462 initval for Global WLAN, BT settings
Date: Fri, 18 May 2012 19:37:28 +0530 [thread overview]
Message-ID: <1337350053-15491-5-git-send-email-rmanohar@qca.qualcomm.com> (raw)
In-Reply-To: <1337350053-15491-1-git-send-email-rmanohar@qca.qualcomm.com>
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 3 +++
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 3 +++
drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 5 +++++
drivers/net/wireless/ath/ath9k/hw.h | 2 +-
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index a0e3394..17e3703 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -305,6 +305,9 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
ar9462_common_rx_gain_table_2p0,
ARRAY_SIZE(ar9462_common_rx_gain_table_2p0), 2);
+ INIT_INI_ARRAY(&ah->ini_glb_wlan_bt, ar9462_2p0_glb_wlan_bt,
+ ARRAY_SIZE(ar9462_2p0_glb_wlan_bt), 2);
+
/* Awake -> Sleep Setting */
INIT_INI_ARRAY(&ah->iniPcieSerdes,
PCIE_PLL_ON_CREQ_DIS_L1_2P0,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 11abb97..02dee90 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -676,6 +676,9 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
if (chan->channel == 2484)
ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1);
+ if (AR_SREV_9462(ah))
+ ar9003_hw_prog_ini(ah, &ah->ini_glb_wlan_bt, 1);
+
ah->modes_index = modesIndex;
ar9003_hw_override_ini(ah);
ar9003_hw_set_channel_regs(ah, chan);
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index a10ece0..89032bb 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -358,6 +358,11 @@ static const u32 ar9462_common_rx_gain_table_2p0[][2] = {
{0x0000b1fc, 0x00000196},
};
+static const u32 ar9462_2p0_glb_wlan_bt[][2] = {
+ /* Addr allmodes */
+ {0x0002002c, 0x00000003},
+};
+
static const u32 ar9462_pciephy_clkreq_disable_L1_2p0[][2] = {
/* Addr allmodes */
{0x00018c00, 0x18213ede},
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 3740aab..f807442 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -824,7 +824,7 @@ struct ath_hw {
struct ar5416IniArray ini_japan2484;
struct ar5416IniArray iniModes_9271_ANI_reg;
struct ar5416IniArray ini_radio_post_sys2ant;
- struct ar5416IniArray ini_BTCOEX_MAX_TXPWR;
+ struct ar5416IniArray ini_glb_wlan_bt;
struct ar5416IniArray iniMac[ATH_INI_NUM_SPLIT];
struct ar5416IniArray iniBB[ATH_INI_NUM_SPLIT];
--
1.7.10.2
next prev parent reply other threads:[~2012-05-18 14:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 14:07 [PATCH 01/10] ath9k_hw: update ar9462 initval table to fix rx nfcal Rajkumar Manoharan
2012-05-18 14:07 ` [PATCH 02/10] ath9k: cleanup MCI indentation Rajkumar Manoharan
2012-05-18 14:07 ` [PATCH 03/10] ath9k_hw: fix IQ calibration chain index Rajkumar Manoharan
2012-05-18 14:07 ` [PATCH 04/10] ath9k_hw: program BT to control SPDT Rajkumar Manoharan
2012-05-18 14:07 ` Rajkumar Manoharan [this message]
2012-05-18 15:48 ` [PATCH 05/10] ath9k_hw: add AR9462 initval for Global WLAN, BT settings Sujith Manoharan
2012-05-18 14:07 ` [PATCH 06/10] ath9k_hw: fix BT RF performance Rajkumar Manoharan
2012-05-18 15:50 ` Sujith Manoharan
2012-05-18 14:07 ` [PATCH 07/10] ath9k: BT coex performance tuning for AR9462 Rajkumar Manoharan
2012-05-18 14:07 ` [PATCH 08/10] ath: do not update cycle counters with sleep mode results Rajkumar Manoharan
2012-05-18 14:07 ` [PATCH 09/10] ath9k: always perform ani calibration at poll interval Rajkumar Manoharan
2012-05-18 14:07 ` [PATCH 10/10] ath9k_hw: fix power state for MCI Rajkumar Manoharan
2012-05-18 15:45 ` [PATCH 01/10] ath9k_hw: update ar9462 initval table to fix rx nfcal Sujith Manoharan
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=1337350053-15491-5-git-send-email-rmanohar@qca.qualcomm.com \
--to=rmanohar@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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