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

Commit e17f83ea authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: simplify revision checks for AR9285 



Since AR9285 v1.0 and v1.1 were never sold (and the initvals removed),
its revision checks can be simplified similar to AR9280

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7a37081e

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

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static void ar5008_hw_set_channel_regs(struct ath_hw *ah, 
	u32 phymode;

	u32 enableDacFifo = 0;



	if (AR_SREV_9285_10_OR_LATER(ah))

	if (AR_SREV_9285_12_OR_LATER(ah))

		enableDacFifo = (REG_READ(ah, AR_PHY_TURBO) &

					 AR_PHY_FC_ENABLE_DAC_FIFO);

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

+1 −10
Original line number Diff line number Diff line
@@ -567,11 +567,6 @@ static inline void ar9285_hw_pa_cal(struct ath_hw *ah, bool is_reset) 
	    AR5416_EEP_TXGAIN_HIGH_POWER)

		return;



	if (AR_SREV_9285_11(ah)) {

		REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14));

		udelay(10);

	}



	for (i = 0; i < ARRAY_SIZE(regList); i++)

		regList[i][1] = REG_READ(ah, regList[i][0]);
@@ -651,10 +646,6 @@ static inline void ar9285_hw_pa_cal(struct ath_hw *ah, bool is_reset) 
		REG_WRITE(ah, regList[i][0], regList[i][1]);



	REG_RMW_FIELD(ah, AR9285_AN_RF2G6, AR9285_AN_RF2G6_CCOMP, ccomp_org);



	if (AR_SREV_9285_11(ah))

		REG_WRITE(ah, AR9285_AN_TOP4, AR9285_AN_TOP4_DEFAULT);



}



static void ar9002_hw_pa_cal(struct ath_hw *ah, bool is_reset)
@@ -664,7 +655,7 @@ static void ar9002_hw_pa_cal(struct ath_hw *ah, bool is_reset) 
			ar9271_hw_pa_cal(ah, is_reset);

		else

			ah->pacal_info.skipcount--;

	} else if (AR_SREV_9285_11_OR_LATER(ah)) {

	} else if (AR_SREV_9285_12_OR_LATER(ah)) {

		if (is_reset || !ah->pacal_info.skipcount)

			ar9285_hw_pa_cal(ah, is_reset);

		else

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

+0 −6
Original line number Diff line number Diff line
@@ -909,9 +909,6 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah, 
		      AR9280_PHY_RXGAIN_TXRX_ATTEN, txRxAttenLocal);

	REG_RMW_FIELD(ah, AR_PHY_RXGAIN + 0x1000,

		      AR9280_PHY_RXGAIN_TXRX_MARGIN, pModal->rxTxMarginCh[0]);



	if (AR_SREV_9285_11(ah))

		REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14));

}



/*
@@ -1109,9 +1106,6 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah, 
	}





	if (AR_SREV_9285_11(ah))

		REG_WRITE(ah, AR9285_AN_TOP4, AR9285_AN_TOP4_DEFAULT);



	REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH,

		      pModal->switchSettling);

	REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ, AR_PHY_DESIRED_SZ_ADC,

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

+4 −4
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ bool ath9k_hw_check_alive(struct ath_hw *ah) 
	int count = 50;

	u32 reg;



	if (AR_SREV_9285_10_OR_LATER(ah))

	if (AR_SREV_9285_12_OR_LATER(ah))

		return true;



	do {
@@ -1787,7 +1787,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	regulatory->current_rd = eeval;



	eeval = ah->eep_ops->get_eeprom(ah, EEP_REG_1);

	if (AR_SREV_9285_10_OR_LATER(ah))

	if (AR_SREV_9285_12_OR_LATER(ah))

		eeval |= AR9285_RDEXT_DEFAULT;

	regulatory->current_rd_ext = eeval;
@@ -1893,7 +1893,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		pCap->num_gpio_pins = AR9271_NUM_GPIO;

	else if (AR_DEVID_7010(ah))

		pCap->num_gpio_pins = AR7010_NUM_GPIO;

	else if (AR_SREV_9285_10_OR_LATER(ah))

	else if (AR_SREV_9285_12_OR_LATER(ah))

		pCap->num_gpio_pins = AR9285_NUM_GPIO;

	else if (AR_SREV_9280_20_OR_LATER(ah))

		pCap->num_gpio_pins = AR928X_NUM_GPIO;
@@ -2075,7 +2075,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio) 
		return MS_REG_READ(AR9271, gpio) != 0;

	else if (AR_SREV_9287_10_OR_LATER(ah))

		return MS_REG_READ(AR9287, gpio) != 0;

	else if (AR_SREV_9285_10_OR_LATER(ah))

	else if (AR_SREV_9285_12_OR_LATER(ah))

		return MS_REG_READ(AR9285, gpio) != 0;

	else if (AR_SREV_9280_20_OR_LATER(ah))

		return MS_REG_READ(AR928X, gpio) != 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc) 
		rfilt |= ATH9K_RX_FILTER_BEACON;



	if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) ||

	    AR_SREV_9285_10_OR_LATER(sc->sc_ah)) &&

	    AR_SREV_9285_12_OR_LATER(sc->sc_ah)) &&

	    (sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&

	    (sc->rx.rxfilter & FIF_PSPOLL))

		rfilt |= ATH9K_RX_FILTER_PSPOLL;