lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[037/289] ath9k_hw: Set proper eeprom offset for AR9287 HTC devices
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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

    From: Rajkumar Manoharan <rmanoharan@atheros.com>

    commit b5261cf4f3860bd772346a3e692683b6144dd44c upstream.

    AR9287 based PCI & USB devices are differed in eeprom start offset.
    So set proper the offset for HTC devices to read nvram correctly.

    Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +-
    drivers/net/wireless/ath/ath9k/reg.h | 4 ++++
    2 files changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
    +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
    @@ -37,7 +37,7 @@ static bool ath9k_hw_ar9287_fill_eeprom(
    int addr, eep_start_loc;
    eep_data = (u16 *)eep;

    - if (ah->hw_version.devid == 0x7015)
    + if (AR9287_HTC_DEVID(ah))
    eep_start_loc = AR9287_HTC_EEP_START_LOC;
    else
    eep_start_loc = AR9287_EEP_START_LOC;
    --- a/drivers/net/wireless/ath/ath9k/reg.h
    +++ b/drivers/net/wireless/ath/ath9k/reg.h
    @@ -903,6 +903,10 @@
    ((_ah)->hw_version.devid == 0x7015) || \
    ((_ah)->hw_version.devid == 0x9018))

    +#define AR9287_HTC_DEVID(_ah) \
    + (((_ah)->hw_version.devid == 0x7015) || \
    + ((_ah)->hw_version.devid == 0x1200))
    +
    #define AR_RADIO_SREV_MAJOR 0xf0
    #define AR_RAD5133_SREV_MAJOR 0xc0
    #define AR_RAD2133_SREV_MAJOR 0xd0



    \
     
     \ /
      Last update: 2010-12-08 02:59    [W:3.104 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site