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

Commit b2ca5dcc authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: N-PHY: drop second noise variance table 



New Broadcom drivers don't upload it anymore. It was probably a copy & paste
mistake in early N-PHY rev 3+ days.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a73815e

drivers/net/wireless/b43/tables_nphy.c

+2 −70
Original line number Diff line number Diff line
@@ -1627,74 +1627,7 @@ static const u32 b43_ntab_tdtrn_r3[] = { 
	0xfa58fc00, 0x0b64fc7e, 0x0800f7b6, 0x00f006be,

};



static const u32 b43_ntab_noisevar0_r3[] = {

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

};



static const u32 b43_ntab_noisevar1_r3[] = {

static const u32 b43_ntab_noisevar_r3[] = {

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,

	0x02110211, 0x0000014d, 0x02110211, 0x0000014d,
@@ -3114,8 +3047,7 @@ static void b43_nphy_tables_init_rev3(struct b43_wldev *dev) 
	ntab_upload(dev, B43_NTAB_TMAP_R3, b43_ntab_tmap_r3);

	ntab_upload(dev, B43_NTAB_INTLEVEL_R3, b43_ntab_intlevel_r3);

	ntab_upload(dev, B43_NTAB_TDTRN_R3, b43_ntab_tdtrn_r3);

	ntab_upload(dev, B43_NTAB_NOISEVAR0_R3, b43_ntab_noisevar0_r3);

	ntab_upload(dev, B43_NTAB_NOISEVAR1_R3, b43_ntab_noisevar1_r3);

	ntab_upload(dev, B43_NTAB_NOISEVAR_R3, b43_ntab_noisevar_r3);

	ntab_upload(dev, B43_NTAB_MCS_R3, b43_ntab_mcs_r3);

	ntab_upload(dev, B43_NTAB_TDI20A0_R3, b43_ntab_tdi20a0_r3);

	ntab_upload(dev, B43_NTAB_TDI20A1_R3, b43_ntab_tdi20a1_r3);

drivers/net/wireless/b43/tables_nphy.h

+1 −2
Original line number Diff line number Diff line
@@ -143,8 +143,7 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent( 
#define B43_NTAB_TMAP_R3		B43_NTAB32(12,   0) /* TM AP  */

#define B43_NTAB_INTLEVEL_R3		B43_NTAB32(13,   0) /* INT LV  */

#define B43_NTAB_TDTRN_R3		B43_NTAB32(14,   0) /* TD TRN  */

#define B43_NTAB_NOISEVAR0_R3		B43_NTAB32(16,   0) /* noise variance 0  */

#define B43_NTAB_NOISEVAR1_R3		B43_NTAB32(16, 128) /* noise variance 1  */

#define B43_NTAB_NOISEVAR_R3		B43_NTAB32(16,   0) /* noise variance */

#define B43_NTAB_MCS_R3			B43_NTAB16(18,   0) /* MCS  */

#define B43_NTAB_TDI20A0_R3		B43_NTAB32(19, 128) /* TDI 20/0  */

#define B43_NTAB_TDI20A1_R3		B43_NTAB32(19, 256) /* TDI 20/1  */