lkml.org 
[lkml]   [2013]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 096/145] ath9k_hw: Assign default xlna config for AR9485
    Date
    3.8.13.5 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sujith Manoharan <c_manoha@qca.qualcomm.com>

    commit 30d5b709da23f4ab9836c7f66d2d2e780a69cf12 upstream.

    For AR9485 boards with XLNA, the default gpio config
    is not set correctly, fix this.

    Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 ++++++--
    drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 ++
    2 files changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
    index 562186c..92e761a 100644
    --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
    +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
    @@ -3563,14 +3563,18 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
    {
    struct ath9k_hw_capabilities *pCap = &ah->caps;
    int chain;
    - u32 regval;
    + u32 regval, value;
    static const u32 switch_chain_reg[AR9300_MAX_CHAINS] = {
    AR_PHY_SWITCH_CHAIN_0,
    AR_PHY_SWITCH_CHAIN_1,
    AR_PHY_SWITCH_CHAIN_2,
    };

    - u32 value = ar9003_hw_ant_ctrl_common_get(ah, is2ghz);
    + if (AR_SREV_9485(ah) && (ar9003_hw_get_rx_gain_idx(ah) == 0))
    + ath9k_hw_cfg_output(ah, AR9300_EXT_LNA_CTL_GPIO_AR9485,
    + AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED);
    +
    + value = ar9003_hw_ant_ctrl_common_get(ah, is2ghz);

    if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
    REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM,
    diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
    index 1079562..6bf7652 100644
    --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
    +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
    @@ -351,6 +351,8 @@

    #define AR_PHY_CCA_NOM_VAL_9330_2GHZ -118

    +#define AR9300_EXT_LNA_CTL_GPIO_AR9485 9
    +
    /*
    * AGC Field Definitions
    */
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-18 06:01    [W:4.078 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site