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

Commit ebd5a14a authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k_hw: move the RF claim stuff to AR9002 hardware family 



Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 57b98384

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

+43 −0
Original line number Diff line number Diff line
@@ -483,6 +483,49 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, 
	}

}



static int ar9002_hw_get_radiorev(struct ath_hw *ah)

{

	u32 val;

	int i;



	REG_WRITE(ah, AR_PHY(0x36), 0x00007058);



	for (i = 0; i < 8; i++)

		REG_WRITE(ah, AR_PHY(0x20), 0x00010000);

	val = (REG_READ(ah, AR_PHY(256)) >> 24) & 0xff;

	val = ((val & 0xf0) >> 4) | ((val & 0x0f) << 4);



	return ath9k_hw_reverse_bits(val, 8);

}



int ar9002_hw_rf_claim(struct ath_hw *ah)

{

	u32 val;



	REG_WRITE(ah, AR_PHY(0), 0x00000007);



	val = ar9002_hw_get_radiorev(ah);

	switch (val & AR_RADIO_SREV_MAJOR) {

	case 0:

		val = AR_RAD5133_SREV_MAJOR;

		break;

	case AR_RAD5133_SREV_MAJOR:

	case AR_RAD5122_SREV_MAJOR:

	case AR_RAD2133_SREV_MAJOR:

	case AR_RAD2122_SREV_MAJOR:

		break;

	default:

		ath_print(ath9k_hw_common(ah), ATH_DBG_FATAL,

			  "Radio Chip Rev 0x%02X not supported\n",

			  val & AR_RADIO_SREV_MAJOR);

		return -EOPNOTSUPP;

	}



	ah->hw_version.analog5GhzRev = val;



	return 0;

}



/* Sets up the AR5008/AR9001/AR9002 hardware familiy callbacks */

void ar9002_hw_attach_ops(struct ath_hw *ah)

{

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

+5 −46
Original line number Diff line number Diff line
@@ -264,21 +264,6 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah) 
	}

}



static int ath9k_hw_get_radiorev(struct ath_hw *ah)

{

	u32 val;

	int i;



	REG_WRITE(ah, AR_PHY(0x36), 0x00007058);



	for (i = 0; i < 8; i++)

		REG_WRITE(ah, AR_PHY(0x20), 0x00010000);

	val = (REG_READ(ah, AR_PHY(256)) >> 24) & 0xff;

	val = ((val & 0xf0) >> 4) | ((val & 0x0f) << 4);



	return ath9k_hw_reverse_bits(val, 8);

}



/************************************/

/* HW Attach, Detach, Init Routines */

/************************************/
@@ -438,34 +423,6 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah) 
	ah->power_mode = ATH9K_PM_UNDEFINED;

}



static int ath9k_hw_rf_claim(struct ath_hw *ah)

{

	u32 val;



	REG_WRITE(ah, AR_PHY(0), 0x00000007);



	val = ath9k_hw_get_radiorev(ah);

	switch (val & AR_RADIO_SREV_MAJOR) {

	case 0:

		val = AR_RAD5133_SREV_MAJOR;

		break;

	case AR_RAD5133_SREV_MAJOR:

	case AR_RAD5122_SREV_MAJOR:

	case AR_RAD2133_SREV_MAJOR:

	case AR_RAD2122_SREV_MAJOR:

		break;

	default:

		ath_print(ath9k_hw_common(ah), ATH_DBG_FATAL,

			  "Radio Chip Rev 0x%02X not supported\n",

			  val & AR_RADIO_SREV_MAJOR);

		return -EOPNOTSUPP;

	}



	ah->hw_version.analog5GhzRev = val;



	return 0;

}



static int ath9k_hw_init_macaddr(struct ath_hw *ah)

{

	struct ath_common *common = ath9k_hw_common(ah);
@@ -496,9 +453,11 @@ static int ath9k_hw_post_init(struct ath_hw *ah) 
			return -ENODEV;

	}



	ecode = ath9k_hw_rf_claim(ah);

	if (!AR_SREV_9300_20_OR_LATER(ah)) {

		ecode = ar9002_hw_rf_claim(ah);

		if (ecode != 0)

			return ecode;

	}



	ecode = ath9k_hw_eeprom_init(ah);

	if (ecode != 0)

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

+5 −0
Original line number Diff line number Diff line
@@ -844,7 +844,12 @@ void ath9k_hw_htc_resetinit(struct ath_hw *ah); 
void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,

				   u32 *coef_mantissa, u32 *coef_exponent);



/*

 * Code Specific to AR5008, AR9001 or AR9002,

 * we stuff these here to avoid callbacks for AR9003.

 */

void ar9002_hw_cck_chan14_spread(struct ath_hw *ah);

int ar9002_hw_rf_claim(struct ath_hw *ah);



/*

 * Code specifric to AR9003, we stuff these here to avoid callbacks