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

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

ath9k: inline AR9271 1.0 INI overrides 



Makes them more readable and reduces code size

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

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

+4 −3
Original line number Diff line number Diff line
@@ -834,9 +834,10 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 
	    AR_SREV_9287_11_OR_LATER(ah))

		REG_WRITE_ARRAY(&ah->iniModesTxGain, modesIndex, regWrites);



	if (AR_SREV_9271_10(ah))

		REG_WRITE_ARRAY(&ah->iniModes_9271_1_0_only,

				modesIndex, regWrites);

	if (AR_SREV_9271_10(ah)) {

		REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENA);

		REG_RMW_FIELD(ah, AR_PHY_RF_CTL3, AR_PHY_TX_END_TO_ADC_ON, 0xa);

	}



	ENABLE_REGWRITE_BUFFER(ah);

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

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah) 
			       ARRAY_SIZE(ar9271Modes_9271), 5);

		INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271,

			       ARRAY_SIZE(ar9271Common_9271), 2);

		INIT_INI_ARRAY(&ah->iniModes_9271_1_0_only,

			       ar9271Modes_9271_1_0_only,

			       ARRAY_SIZE(ar9271Modes_9271_1_0_only), 5);

		INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg,

			       ARRAY_SIZE(ar9271Modes_9271_ANI_reg), 5);

		return;

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

+0 −6
Original line number Diff line number Diff line
@@ -3092,12 +3092,6 @@ static const u32 ar9271Common_9271[][2] = { 
	{0x0000d384, 0xf3307ff0},

};



static const u32 ar9271Modes_9271_1_0_only[][5] = {

	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */

	{0x00009910, 0x30002311, 0x30002311, 0x30002311, 0x30002311},

	{0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},

};



static const u32 ar9271Modes_9271_ANI_reg[][5] = {

	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */

	{0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2},

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

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#define AR_PHY_RF_CTL3                  0x9828

#define AR_PHY_TX_END_TO_A2_RX_ON       0x00FF0000

#define AR_PHY_TX_END_TO_A2_RX_ON_S     16

#define AR_PHY_TX_END_TO_ADC_ON         0xFF000000

#define AR_PHY_TX_END_TO_ADC_ON_S       24



#define AR_PHY_ADC_CTL                  0x982C

#define AR_PHY_ADC_CTL_OFF_INBUFGAIN    0x00000003

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

+0 −1
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ struct ath_hw { 
	struct ar5416IniArray iniAdditional;

	struct ar5416IniArray iniModesRxGain;

	struct ar5416IniArray iniModesTxGain;

	struct ar5416IniArray iniModes_9271_1_0_only;

	struct ar5416IniArray iniCckfirNormal;

	struct ar5416IniArray iniCckfirJapan2484;

	struct ar5416IniArray ini_japan2484;