tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ath9k: Update AR9331 v1.1 initvals
* Update radio/baseband/gain tables.
* Mark ar9331_modes_high_power_tx_gain_1p1 as a duplicate
* ar9331_1p1_mac_postamble is not a duplicate.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
authored by
Sujith Manoharan
and committed by
John W. Linville
367ba05f
11295126
+24
-104
+24
-104
drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
+24
-104
drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
···
18
18
#ifndef INITVALS_9330_1P1_H
19
19
#define INITVALS_9330_1P1_H
20
20
21
+
#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9300_2p2_baseband_core_txfir_coeff_japan_2484
22
+
23
+
#define ar9331_modes_high_power_tx_gain_1p1 ar9331_modes_lowest_ob_db_tx_gain_1p1
24
+
21
25
static const u32 ar9331_1p1_baseband_postamble[][5] = {
22
26
/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
23
27
{0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
···
59
55
{0x0000a284, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
60
56
{0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
61
57
{0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
62
-
{0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
58
+
{0x0000a2c4, 0x00158d18, 0x00158d18, 0x00058d18, 0x00058d18},
63
59
{0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982},
64
60
{0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
65
61
{0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
···
256
252
{0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
257
253
{0x0000a2e4, 0xfffff000, 0xfffff000, 0xfffff000, 0xfffff000},
258
254
{0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffe0000, 0xfffe0000},
259
-
{0x0000a410, 0x000050d7, 0x000050d7, 0x000050d0, 0x000050d0},
255
+
{0x0000a410, 0x000050d7, 0x000050d7, 0x000050d4, 0x000050d4},
260
256
{0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
261
257
{0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
262
258
{0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
···
341
337
{0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
342
338
};
343
339
344
-
#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
345
-
346
340
static const u32 ar9331_1p1_xtal_25M[][2] = {
347
341
/* Addr allmodes */
348
342
{0x00007038, 0x000002f8},
···
375
373
{0x000160b4, 0x92480040},
376
374
{0x000160c0, 0x006db6db},
377
375
{0x000160c4, 0x0186db60},
378
-
{0x000160c8, 0x6db4db6c},
376
+
{0x000160c8, 0x6db6db6c},
379
377
{0x000160cc, 0x6de6c300},
380
378
{0x000160d0, 0x14500820},
381
379
{0x00016100, 0x04cb0001},
382
380
{0x00016104, 0xfff80015},
383
381
{0x00016108, 0x00080010},
384
382
{0x0001610c, 0x00170000},
385
-
{0x00016140, 0x10800000},
383
+
{0x00016140, 0x50804000},
386
384
{0x00016144, 0x01884080},
387
385
{0x00016148, 0x000080c0},
388
-
{0x00016280, 0x01000015},
386
+
{0x00016280, 0x01001015},
389
387
{0x00016284, 0x14d20000},
390
388
{0x00016288, 0x00318000},
391
389
{0x0001628c, 0x50000000},
···
624
622
{0x0000a370, 0x00000000},
625
623
{0x0000a390, 0x00000001},
626
624
{0x0000a394, 0x00000444},
627
-
{0x0000a398, 0x001f0e0f},
628
-
{0x0000a39c, 0x0075393f},
629
-
{0x0000a3a0, 0xb79f6427},
630
-
{0x0000a3a4, 0x00000000},
631
-
{0x0000a3a8, 0xaaaaaaaa},
632
-
{0x0000a3ac, 0x3c466478},
625
+
{0x0000a398, 0x00000000},
626
+
{0x0000a39c, 0x210d0401},
627
+
{0x0000a3a0, 0xab9a7144},
628
+
{0x0000a3a4, 0x00000011},
629
+
{0x0000a3a8, 0x3c3c003d},
630
+
{0x0000a3ac, 0x30310030},
633
631
{0x0000a3c0, 0x20202020},
634
632
{0x0000a3c4, 0x22222220},
635
633
{0x0000a3c8, 0x20200020},
···
688
686
{0x0000a7dc, 0x00000001},
689
687
};
690
688
691
-
static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
689
+
static const u32 ar9331_1p1_mac_postamble[][5] = {
692
690
/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
693
-
{0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
694
-
{0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
695
-
{0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
696
-
{0x0000a2e4, 0xfffff000, 0xfffff000, 0xfffff000, 0xfffff000},
697
-
{0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffe0000, 0xfffe0000},
698
-
{0x0000a410, 0x000050d7, 0x000050d7, 0x000050d0, 0x000050d0},
699
-
{0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
700
-
{0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
701
-
{0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
702
-
{0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
703
-
{0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
704
-
{0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
705
-
{0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
706
-
{0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
707
-
{0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
708
-
{0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
709
-
{0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
710
-
{0x0000a52c, 0x41023e85, 0x41023e85, 0x2d000a20, 0x2d000a20},
711
-
{0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000a22, 0x31000a22},
712
-
{0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000a24, 0x35000a24},
713
-
{0x0000a538, 0x53023f4b, 0x53023f4b, 0x38000a43, 0x38000a43},
714
-
{0x0000a53c, 0x5a027f09, 0x5a027f09, 0x3b000e42, 0x3b000e42},
715
-
{0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x3f000e44, 0x3f000e44},
716
-
{0x0000a544, 0x6502feca, 0x6502feca, 0x42000e64, 0x42000e64},
717
-
{0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x46000e66, 0x46000e66},
718
-
{0x0000a54c, 0x7203feca, 0x7203feca, 0x4a000ea6, 0x4a000ea6},
719
-
{0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x4a000ea6, 0x4a000ea6},
720
-
{0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x4a000ea6, 0x4a000ea6},
721
-
{0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x4a000ea6, 0x4a000ea6},
722
-
{0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x4a000ea6, 0x4a000ea6},
723
-
{0x0000a560, 0x900fff0b, 0x900fff0b, 0x4a000ea6, 0x4a000ea6},
724
-
{0x0000a564, 0x960fffcb, 0x960fffcb, 0x4a000ea6, 0x4a000ea6},
725
-
{0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
726
-
{0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
727
-
{0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
728
-
{0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
729
-
{0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
730
-
{0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x4a000ea6, 0x4a000ea6},
731
-
{0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
732
-
{0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
733
-
{0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
734
-
{0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
735
-
{0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
736
-
{0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
737
-
{0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
738
-
{0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
739
-
{0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
740
-
{0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
741
-
{0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
742
-
{0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
743
-
{0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
744
-
{0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
745
-
{0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
746
-
{0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
747
-
{0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
748
-
{0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
749
-
{0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
750
-
{0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
751
-
{0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
752
-
{0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
753
-
{0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
754
-
{0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
755
-
{0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
756
-
{0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
757
-
{0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
758
-
{0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
759
-
{0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
760
-
{0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
761
-
{0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
762
-
{0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
763
-
{0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
764
-
{0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
765
-
{0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
766
-
{0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
767
-
{0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
768
-
{0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
769
-
{0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
770
-
{0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
771
-
{0x0000a620, 0x0280c802, 0x0280c802, 0x0280c802, 0x0280c802},
772
-
{0x0000a624, 0x03010a03, 0x03010a03, 0x03010a03, 0x03010a03},
773
-
{0x0000a628, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
774
-
{0x0000a62c, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
775
-
{0x0000a630, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
776
-
{0x0000a634, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
777
-
{0x0000a638, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
778
-
{0x0000a63c, 0x03010c04, 0x03010c04, 0x03010c04, 0x03010c04},
779
-
{0x00016044, 0x034922db, 0x034922db, 0x034922db, 0x034922db},
780
-
{0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
691
+
{0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
692
+
{0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
693
+
{0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
694
+
{0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
695
+
{0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
696
+
{0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
697
+
{0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
698
+
{0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
781
699
};
782
-
783
-
#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble
784
700
785
701
static const u32 ar9331_1p1_soc_preamble[][2] = {
786
702
/* Addr allmodes */