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

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

ath9k: de-duplicate initvals 

The initvals tool from https://github.com/mcgrof/qca-swiss-army-knife

 has
been modified to detect identical initval tables and replace them with
macros. This patch contains the generated changes.

On MIPS this reduces the binary size by 24 KB with no runtime changes.

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

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

+1 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2012 Qualcomm Atheros Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

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

+2 −51
Original line number Diff line number Diff line
@@ -337,12 +337,7 @@ static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = { 
	{0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},

};



static const u32 ar9331_1p1_baseband_core_txfir_coeff_japan_2484[][2] = {

	/* Addr      allmodes  */

	{0x0000a398, 0x00000000},

	{0x0000a39c, 0x6f7f0301},

	{0x0000a3a0, 0xca9228ee},

};

#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484



static const u32 ar9331_1p1_xtal_25M[][2] = {

	/* Addr      allmodes  */
@@ -783,17 +778,7 @@ static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = { 
	{0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},

};



static const u32 ar9331_1p1_mac_postamble[][5] = {

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

	{0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},

	{0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},

	{0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},

	{0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},

	{0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},

	{0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},

	{0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},

	{0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},

};

#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble



static const u32 ar9331_1p1_soc_preamble[][2] = {

	/* Addr      allmodes  */
@@ -1112,38 +1097,4 @@ static const u32 ar9331_common_tx_gain_offset1_1[][1] = { 
	{0x00000000},

};



static const u32 ar9331_1p1_chansel_xtal_25M[] = {

	0x0101479e,

	0x0101d027,

	0x010258af,

	0x0102e138,

	0x010369c0,

	0x0103f249,

	0x01047ad1,

	0x0105035a,

	0x01058be2,

	0x0106146b,

	0x01069cf3,

	0x0107257c,

	0x0107ae04,

	0x0108f5b2,

};



static const u32 ar9331_1p1_chansel_xtal_40M[] = {

	0x00a0ccbe,

	0x00a12213,

	0x00a17769,

	0x00a1ccbe,

	0x00a22213,

	0x00a27769,

	0x00a2ccbe,

	0x00a32213,

	0x00a37769,

	0x00a3ccbe,

	0x00a42213,

	0x00a47769,

	0x00a4ccbe,

	0x00a5998b,

};



#endif /* INITVALS_9330_1P1_H */

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

+22 −860

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −286
Original line number Diff line number Diff line
@@ -100,18 +100,7 @@ static const u32 ar9340Modes_lowest_ob_db_tx_gain_table_1p0[][5] = { 
	{0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},

};



static const u32 ar9340Modes_fast_clock_1p0[][3] = {

	/* Addr      5G_HT20     5G_HT40   */

	{0x00001030, 0x00000268, 0x000004d0},

	{0x00001070, 0x0000018c, 0x00000318},

	{0x000010b0, 0x00000fd0, 0x00001fa0},

	{0x00008014, 0x044c044c, 0x08980898},

	{0x0000801c, 0x148ec02b, 0x148ec057},

	{0x00008318, 0x000044c0, 0x00008980},

	{0x00009e00, 0x0372131c, 0x0372131c},

	{0x0000a230, 0x0000000b, 0x00000016},

	{0x0000a254, 0x00000898, 0x00001130},

};

#define ar9340Modes_fast_clock_1p0 ar9300Modes_fast_clock_2p2



static const u32 ar9340_1p0_radio_core[][2] = {

	/* Addr      allmodes  */
@@ -224,22 +213,9 @@ static const u32 ar9340_1p0_radio_core_40M[][2] = { 
	{0x000160b0, 0x01885f5a},

};



static const u32 ar9340_1p0_mac_postamble[][5] = {

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

	{0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},

	{0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},

	{0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},

	{0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},

	{0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},

	{0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},

	{0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},

	{0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},

};

#define ar9340_1p0_mac_postamble ar9300_2p2_mac_postamble



static const u32 ar9340_1p0_soc_postamble[][5] = {

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

	{0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},

};

#define ar9340_1p0_soc_postamble ar9300_2p2_soc_postamble



static const u32 ar9340_1p0_baseband_postamble[][5] = {

	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -1359,265 +1335,7 @@ static const u32 ar9340_1p0_mac_core[][2] = { 
	{0x000083d0, 0x000101ff},

};



static const u32 ar9340Common_wo_xlna_rx_gain_table_1p0[][2] = {

	/* Addr      allmodes  */

	{0x0000a000, 0x00010000},

	{0x0000a004, 0x00030002},

	{0x0000a008, 0x00050004},

	{0x0000a00c, 0x00810080},

	{0x0000a010, 0x00830082},

	{0x0000a014, 0x01810180},

	{0x0000a018, 0x01830182},

	{0x0000a01c, 0x01850184},

	{0x0000a020, 0x01890188},

	{0x0000a024, 0x018b018a},

	{0x0000a028, 0x018d018c},

	{0x0000a02c, 0x03820190},

	{0x0000a030, 0x03840383},

	{0x0000a034, 0x03880385},

	{0x0000a038, 0x038a0389},

	{0x0000a03c, 0x038c038b},

	{0x0000a040, 0x0390038d},

	{0x0000a044, 0x03920391},

	{0x0000a048, 0x03940393},

	{0x0000a04c, 0x03960395},

	{0x0000a050, 0x00000000},

	{0x0000a054, 0x00000000},

	{0x0000a058, 0x00000000},

	{0x0000a05c, 0x00000000},

	{0x0000a060, 0x00000000},

	{0x0000a064, 0x00000000},

	{0x0000a068, 0x00000000},

	{0x0000a06c, 0x00000000},

	{0x0000a070, 0x00000000},

	{0x0000a074, 0x00000000},

	{0x0000a078, 0x00000000},

	{0x0000a07c, 0x00000000},

	{0x0000a080, 0x29292929},

	{0x0000a084, 0x29292929},

	{0x0000a088, 0x29292929},

	{0x0000a08c, 0x29292929},

	{0x0000a090, 0x22292929},

	{0x0000a094, 0x1d1d2222},

	{0x0000a098, 0x0c111117},

	{0x0000a09c, 0x00030303},

	{0x0000a0a0, 0x00000000},

	{0x0000a0a4, 0x00000000},

	{0x0000a0a8, 0x00000000},

	{0x0000a0ac, 0x00000000},

	{0x0000a0b0, 0x00000000},

	{0x0000a0b4, 0x00000000},

	{0x0000a0b8, 0x00000000},

	{0x0000a0bc, 0x00000000},

	{0x0000a0c0, 0x001f0000},

	{0x0000a0c4, 0x01000101},

	{0x0000a0c8, 0x011e011f},

	{0x0000a0cc, 0x011c011d},

	{0x0000a0d0, 0x02030204},

	{0x0000a0d4, 0x02010202},

	{0x0000a0d8, 0x021f0200},

	{0x0000a0dc, 0x0302021e},

	{0x0000a0e0, 0x03000301},

	{0x0000a0e4, 0x031e031f},

	{0x0000a0e8, 0x0402031d},

	{0x0000a0ec, 0x04000401},

	{0x0000a0f0, 0x041e041f},

	{0x0000a0f4, 0x0502041d},

	{0x0000a0f8, 0x05000501},

	{0x0000a0fc, 0x051e051f},

	{0x0000a100, 0x06010602},

	{0x0000a104, 0x061f0600},

	{0x0000a108, 0x061d061e},

	{0x0000a10c, 0x07020703},

	{0x0000a110, 0x07000701},

	{0x0000a114, 0x00000000},

	{0x0000a118, 0x00000000},

	{0x0000a11c, 0x00000000},

	{0x0000a120, 0x00000000},

	{0x0000a124, 0x00000000},

	{0x0000a128, 0x00000000},

	{0x0000a12c, 0x00000000},

	{0x0000a130, 0x00000000},

	{0x0000a134, 0x00000000},

	{0x0000a138, 0x00000000},

	{0x0000a13c, 0x00000000},

	{0x0000a140, 0x001f0000},

	{0x0000a144, 0x01000101},

	{0x0000a148, 0x011e011f},

	{0x0000a14c, 0x011c011d},

	{0x0000a150, 0x02030204},

	{0x0000a154, 0x02010202},

	{0x0000a158, 0x021f0200},

	{0x0000a15c, 0x0302021e},

	{0x0000a160, 0x03000301},

	{0x0000a164, 0x031e031f},

	{0x0000a168, 0x0402031d},

	{0x0000a16c, 0x04000401},

	{0x0000a170, 0x041e041f},

	{0x0000a174, 0x0502041d},

	{0x0000a178, 0x05000501},

	{0x0000a17c, 0x051e051f},

	{0x0000a180, 0x06010602},

	{0x0000a184, 0x061f0600},

	{0x0000a188, 0x061d061e},

	{0x0000a18c, 0x07020703},

	{0x0000a190, 0x07000701},

	{0x0000a194, 0x00000000},

	{0x0000a198, 0x00000000},

	{0x0000a19c, 0x00000000},

	{0x0000a1a0, 0x00000000},

	{0x0000a1a4, 0x00000000},

	{0x0000a1a8, 0x00000000},

	{0x0000a1ac, 0x00000000},

	{0x0000a1b0, 0x00000000},

	{0x0000a1b4, 0x00000000},

	{0x0000a1b8, 0x00000000},

	{0x0000a1bc, 0x00000000},

	{0x0000a1c0, 0x00000000},

	{0x0000a1c4, 0x00000000},

	{0x0000a1c8, 0x00000000},

	{0x0000a1cc, 0x00000000},

	{0x0000a1d0, 0x00000000},

	{0x0000a1d4, 0x00000000},

	{0x0000a1d8, 0x00000000},

	{0x0000a1dc, 0x00000000},

	{0x0000a1e0, 0x00000000},

	{0x0000a1e4, 0x00000000},

	{0x0000a1e8, 0x00000000},

	{0x0000a1ec, 0x00000000},

	{0x0000a1f0, 0x00000396},

	{0x0000a1f4, 0x00000396},

	{0x0000a1f8, 0x00000396},

	{0x0000a1fc, 0x00000196},

	{0x0000b000, 0x00010000},

	{0x0000b004, 0x00030002},

	{0x0000b008, 0x00050004},

	{0x0000b00c, 0x00810080},

	{0x0000b010, 0x00830082},

	{0x0000b014, 0x01810180},

	{0x0000b018, 0x01830182},

	{0x0000b01c, 0x01850184},

	{0x0000b020, 0x02810280},

	{0x0000b024, 0x02830282},

	{0x0000b028, 0x02850284},

	{0x0000b02c, 0x02890288},

	{0x0000b030, 0x028b028a},

	{0x0000b034, 0x0388028c},

	{0x0000b038, 0x038a0389},

	{0x0000b03c, 0x038c038b},

	{0x0000b040, 0x0390038d},

	{0x0000b044, 0x03920391},

	{0x0000b048, 0x03940393},

	{0x0000b04c, 0x03960395},

	{0x0000b050, 0x00000000},

	{0x0000b054, 0x00000000},

	{0x0000b058, 0x00000000},

	{0x0000b05c, 0x00000000},

	{0x0000b060, 0x00000000},

	{0x0000b064, 0x00000000},

	{0x0000b068, 0x00000000},

	{0x0000b06c, 0x00000000},

	{0x0000b070, 0x00000000},

	{0x0000b074, 0x00000000},

	{0x0000b078, 0x00000000},

	{0x0000b07c, 0x00000000},

	{0x0000b080, 0x32323232},

	{0x0000b084, 0x2f2f3232},

	{0x0000b088, 0x23282a2d},

	{0x0000b08c, 0x1c1e2123},

	{0x0000b090, 0x14171919},

	{0x0000b094, 0x0e0e1214},

	{0x0000b098, 0x03050707},

	{0x0000b09c, 0x00030303},

	{0x0000b0a0, 0x00000000},

	{0x0000b0a4, 0x00000000},

	{0x0000b0a8, 0x00000000},

	{0x0000b0ac, 0x00000000},

	{0x0000b0b0, 0x00000000},

	{0x0000b0b4, 0x00000000},

	{0x0000b0b8, 0x00000000},

	{0x0000b0bc, 0x00000000},

	{0x0000b0c0, 0x003f0020},

	{0x0000b0c4, 0x00400041},

	{0x0000b0c8, 0x0140005f},

	{0x0000b0cc, 0x0160015f},

	{0x0000b0d0, 0x017e017f},

	{0x0000b0d4, 0x02410242},

	{0x0000b0d8, 0x025f0240},

	{0x0000b0dc, 0x027f0260},

	{0x0000b0e0, 0x0341027e},

	{0x0000b0e4, 0x035f0340},

	{0x0000b0e8, 0x037f0360},

	{0x0000b0ec, 0x04400441},

	{0x0000b0f0, 0x0460045f},

	{0x0000b0f4, 0x0541047f},

	{0x0000b0f8, 0x055f0540},

	{0x0000b0fc, 0x057f0560},

	{0x0000b100, 0x06400641},

	{0x0000b104, 0x0660065f},

	{0x0000b108, 0x067e067f},

	{0x0000b10c, 0x07410742},

	{0x0000b110, 0x075f0740},

	{0x0000b114, 0x077f0760},

	{0x0000b118, 0x07800781},

	{0x0000b11c, 0x07a0079f},

	{0x0000b120, 0x07c107bf},

	{0x0000b124, 0x000007c0},

	{0x0000b128, 0x00000000},

	{0x0000b12c, 0x00000000},

	{0x0000b130, 0x00000000},

	{0x0000b134, 0x00000000},

	{0x0000b138, 0x00000000},

	{0x0000b13c, 0x00000000},

	{0x0000b140, 0x003f0020},

	{0x0000b144, 0x00400041},

	{0x0000b148, 0x0140005f},

	{0x0000b14c, 0x0160015f},

	{0x0000b150, 0x017e017f},

	{0x0000b154, 0x02410242},

	{0x0000b158, 0x025f0240},

	{0x0000b15c, 0x027f0260},

	{0x0000b160, 0x0341027e},

	{0x0000b164, 0x035f0340},

	{0x0000b168, 0x037f0360},

	{0x0000b16c, 0x04400441},

	{0x0000b170, 0x0460045f},

	{0x0000b174, 0x0541047f},

	{0x0000b178, 0x055f0540},

	{0x0000b17c, 0x057f0560},

	{0x0000b180, 0x06400641},

	{0x0000b184, 0x0660065f},

	{0x0000b188, 0x067e067f},

	{0x0000b18c, 0x07410742},

	{0x0000b190, 0x075f0740},

	{0x0000b194, 0x077f0760},

	{0x0000b198, 0x07800781},

	{0x0000b19c, 0x07a0079f},

	{0x0000b1a0, 0x07c107bf},

	{0x0000b1a4, 0x000007c0},

	{0x0000b1a8, 0x00000000},

	{0x0000b1ac, 0x00000000},

	{0x0000b1b0, 0x00000000},

	{0x0000b1b4, 0x00000000},

	{0x0000b1b8, 0x00000000},

	{0x0000b1bc, 0x00000000},

	{0x0000b1c0, 0x00000000},

	{0x0000b1c4, 0x00000000},

	{0x0000b1c8, 0x00000000},

	{0x0000b1cc, 0x00000000},

	{0x0000b1d0, 0x00000000},

	{0x0000b1d4, 0x00000000},

	{0x0000b1d8, 0x00000000},

	{0x0000b1dc, 0x00000000},

	{0x0000b1e0, 0x00000000},

	{0x0000b1e4, 0x00000000},

	{0x0000b1e8, 0x00000000},

	{0x0000b1ec, 0x00000000},

	{0x0000b1f0, 0x00000396},

	{0x0000b1f4, 0x00000396},

	{0x0000b1f8, 0x00000396},

	{0x0000b1fc, 0x00000196},

};

#define ar9340Common_wo_xlna_rx_gain_table_1p0 ar9300Common_wo_xlna_rx_gain_table_2p2



static const u32 ar9340_1p0_soc_preamble[][2] = {

	/* Addr      allmodes  */

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

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Atheros Communications Inc.

 * Copyright (c) 2010-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2012 Qualcomm Atheros Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above