Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9306990a authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Fix bug in reading input gpio state for ar9003 



The register which gives input gpio state is 0x404c for ar9003,
currently 0x4048 is wrongly used. This will disable RF and make
it unusable on some of AR9003.

Cc:stable@kernel.org
Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1937721f

drivers/net/wireless/ath/ath9k/hw.c

+2 −1
Original line number Diff line number Diff line
@@ -2044,7 +2044,8 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio) 
		val = REG_READ(ah, AR7010_GPIO_IN);

		return (MS(val, AR7010_GPIO_IN_VAL) & AR_GPIO_BIT(gpio)) == 0;

	} else if (AR_SREV_9300_20_OR_LATER(ah))

		return MS_REG_READ(AR9300, gpio) != 0;

		return (MS(REG_READ(ah, AR_GPIO_IN), AR9300_GPIO_IN_VAL) &

			AR_GPIO_BIT(gpio)) != 0;

	else if (AR_SREV_9271(ah))

		return MS_REG_READ(AR9271, gpio) != 0;

	else if (AR_SREV_9287_11_OR_LATER(ah))

drivers/net/wireless/ath/ath9k/reg.h

+4 −2
Original line number Diff line number Diff line
@@ -984,11 +984,13 @@ enum { 
#define AR9287_GPIO_IN_VAL_S                     11

#define AR9271_GPIO_IN_VAL                       0xFFFF0000

#define AR9271_GPIO_IN_VAL_S                     16

#define AR9300_GPIO_IN_VAL                       0x0001FFFF

#define AR9300_GPIO_IN_VAL_S                     0

#define AR7010_GPIO_IN_VAL                       0x0000FFFF

#define AR7010_GPIO_IN_VAL_S                     0



#define AR_GPIO_IN				 0x404c

#define AR9300_GPIO_IN_VAL                       0x0001FFFF

#define AR9300_GPIO_IN_VAL_S                     0



#define AR_GPIO_OE_OUT                           (AR_SREV_9300_20_OR_LATER(ah) ? 0x4050 : 0x404c)

#define AR_GPIO_OE_OUT_DRV                       0x3

#define AR_GPIO_OE_OUT_DRV_NO                    0x0