1 From: Oleksij Rempel <linux@rempel-privat.de>
2 Date: Sun, 22 Mar 2015 19:29:47 +0100
3 Subject: [PATCH] ath9k: ar9271_hw_pa_cal - use defs instead of magin
6 This function uses mixed styles for register names/numbers which
7 is make harder reading and optimisation.
9 Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
10 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
13 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
14 +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
15 @@ -430,22 +430,22 @@ static void ar9271_hw_pa_cal(struct ath_
27 + { AR9285_AN_TOP3, 0 },
28 + { AR9285_AN_RXTXBB1, 0 },
29 + { AR9285_AN_RF2G1, 0 },
30 + { AR9285_AN_RF2G2, 0 },
31 + { AR9285_AN_TOP2, 0 },
32 + { AR9285_AN_RF2G8, 0 },
33 + { AR9285_AN_RF2G7, 0 } ,
34 + { AR9285_AN_RF2G3, 0 } ,
37 for (i = 0; i < ARRAY_SIZE(regList); i++)
38 regList[i][1] = REG_READ(ah, regList[i][0]);
40 - regVal = REG_READ(ah, 0x7834);
41 + regVal = REG_READ(ah, AR9285_AN_RF2G6);
43 - REG_WRITE(ah, 0x7834, regVal);
44 + REG_WRITE(ah, AR9285_AN_RF2G6, regVal);
45 regVal = REG_READ(ah, 0x9808);
46 regVal |= (0x1 << 27);
47 REG_WRITE(ah, 0x9808, regVal);
48 @@ -477,7 +477,7 @@ static void ar9271_hw_pa_cal(struct ath_
49 * does not matter since we turn it off
51 REG_RMW_FIELD(ah, AR9285_AN_RF2G7, AR9285_AN_RF2G7_PADRVGN2TAB0, 0);
53 + /* 7828, b0-11, ccom=fff */
54 REG_RMW_FIELD(ah, AR9285_AN_RF2G3, AR9271_AN_RF2G3_CCOMP, 0xfff);
57 @@ -490,15 +490,16 @@ static void ar9271_hw_pa_cal(struct ath_
60 for (i = 6; i > 0; i--) {
61 - regVal = REG_READ(ah, 0x7834);
62 + regVal = REG_READ(ah, AR9285_AN_RF2G6);
63 regVal |= (1 << (20 + i));
64 - REG_WRITE(ah, 0x7834, regVal);
65 + REG_WRITE(ah, AR9285_AN_RF2G6, regVal);
67 /* regVal = REG_READ(ah, 0x7834); */
68 regVal &= (~(0x1 << (20 + i)));
69 - regVal |= (MS(REG_READ(ah, 0x7840), AR9285_AN_RXTXBB1_SPARE9)
70 + regVal |= (MS(REG_READ(ah, AR9285_AN_RF2G9),
71 + AR9285_AN_RXTXBB1_SPARE9)
73 - REG_WRITE(ah, 0x7834, regVal);
74 + REG_WRITE(ah, AR9285_AN_RF2G6, regVal);
77 regVal = (regVal >> 20) & 0x7f;
78 @@ -517,9 +518,9 @@ static void ar9271_hw_pa_cal(struct ath_
80 ENABLE_REGWRITE_BUFFER(ah);
82 - regVal = REG_READ(ah, 0x7834);
83 + regVal = REG_READ(ah, AR_AN_RF2G1_CH1);
85 - REG_WRITE(ah, 0x7834, regVal);
86 + REG_WRITE(ah, AR_AN_RF2G1_CH1, regVal);
87 regVal = REG_READ(ah, 0x9808);
88 regVal &= (~(0x1 << 27));
89 REG_WRITE(ah, 0x9808, regVal);