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

Commit 9a0bc41e authored by Rafał Miłecki's avatar Rafał Miłecki
Browse files

b43: HT-PHY: tables: don't duplicate core-generic regs 



Now when we know many radio regs at 0x000 are core-generic, I've noticed
we duplicate some values in the tables.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
parent d6657db9

drivers/net/wireless/b43/phy_ht.c

+14 −21
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ 
static void b43_radio_2059_channel_setup(struct b43_wldev *dev,

			const struct b43_phy_ht_channeltab_e_radio2059 *e)

{

	u8 i;

	u16 routing;

	static const u16 routing[] = { R2059_C1, R2059_C2, R2059_C3, };

	u16 r;

	int core;



	b43_radio_write(dev, 0x16, e->radio_syn16);

	b43_radio_write(dev, 0x17, e->radio_syn17);
@@ -53,25 +54,17 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev, 
	b43_radio_write(dev, 0x41, e->radio_syn41);

	b43_radio_write(dev, 0x43, e->radio_syn43);

	b43_radio_write(dev, 0x47, e->radio_syn47);

	b43_radio_write(dev, 0x4a, e->radio_syn4a);

	b43_radio_write(dev, 0x58, e->radio_syn58);

	b43_radio_write(dev, 0x5a, e->radio_syn5a);

	b43_radio_write(dev, 0x6a, e->radio_syn6a);

	b43_radio_write(dev, 0x6d, e->radio_syn6d);

	b43_radio_write(dev, 0x6e, e->radio_syn6e);

	b43_radio_write(dev, 0x92, e->radio_syn92);

	b43_radio_write(dev, 0x98, e->radio_syn98);



	for (i = 0; i < 2; i++) {

		routing = i ? R2059_C3 : R2059_C2;

		b43_radio_write(dev, routing | 0x4a, e->radio_rxtx4a);

		b43_radio_write(dev, routing | 0x58, e->radio_rxtx58);

		b43_radio_write(dev, routing | 0x5a, e->radio_rxtx5a);

		b43_radio_write(dev, routing | 0x6a, e->radio_rxtx6a);

		b43_radio_write(dev, routing | 0x6d, e->radio_rxtx6d);

		b43_radio_write(dev, routing | 0x6e, e->radio_rxtx6e);

		b43_radio_write(dev, routing | 0x92, e->radio_rxtx92);

		b43_radio_write(dev, routing | 0x98, e->radio_rxtx98);



	for (core = 0; core < 3; core++) {

		r = routing[core];

		b43_radio_write(dev, r | 0x4a, e->radio_rxtx4a);

		b43_radio_write(dev, r | 0x58, e->radio_rxtx58);

		b43_radio_write(dev, r | 0x5a, e->radio_rxtx5a);

		b43_radio_write(dev, r | 0x6a, e->radio_rxtx6a);

		b43_radio_write(dev, r | 0x6d, e->radio_rxtx6d);

		b43_radio_write(dev, r | 0x6e, e->radio_rxtx6e);

		b43_radio_write(dev, r | 0x92, e->radio_rxtx92);

		b43_radio_write(dev, r | 0x98, e->radio_rxtx98);

	}



	udelay(50);

drivers/net/wireless/b43/radio_2059.c

+9 −30
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#define RADIOREGS(r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \

		  r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, \

		  r20, r21, r22, r23, r24, r25, r26, r27, r28) \

		  r20) \

	.radio_syn16			= r00,	\

	.radio_syn17			= r01,	\

	.radio_syn22			= r02,	\
@@ -41,22 +41,14 @@ 
	.radio_syn41			= r10,	\

	.radio_syn43			= r11,	\

	.radio_syn47			= r12,	\

	.radio_syn4a			= r13,	\

	.radio_syn58			= r14,	\

	.radio_syn5a			= r15,	\

	.radio_syn6a			= r16,	\

	.radio_syn6d			= r17,	\

	.radio_syn6e			= r18,	\

	.radio_syn92			= r19,	\

	.radio_syn98			= r20,	\

	.radio_rxtx4a			= r21,	\

	.radio_rxtx58			= r22,	\

	.radio_rxtx5a			= r23,	\

	.radio_rxtx6a			= r24,	\

	.radio_rxtx6d			= r25,	\

	.radio_rxtx6e			= r26,	\

	.radio_rxtx92			= r27,	\

	.radio_rxtx98			= r28

	.radio_rxtx4a			= r13,	\

	.radio_rxtx58			= r14,	\

	.radio_rxtx5a			= r15,	\

	.radio_rxtx6a			= r16,	\

	.radio_rxtx6d			= r17,	\

	.radio_rxtx6e			= r18,	\

	.radio_rxtx92			= r19,	\

	.radio_rxtx98			= r20



#define PHYREGS(r0, r1, r2, r3, r4, r5)	\

	.phy_regs.bw1	= r0,	\
@@ -70,91 +62,78 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi 
  {	.freq			= 2412,

	RADIOREGS(0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c,

		  0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),

  },

  {	.freq			= 2417,

	RADIOREGS(0x4b, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x71,

		  0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),

  },

  {	.freq			= 2422,

	RADIOREGS(0x4e, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x76,

		  0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),

  },

  {	.freq			= 2427,

	RADIOREGS(0x52, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x7b,

		  0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),

  },

  {	.freq			= 2432,

	RADIOREGS(0x55, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x80,

		  0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),

  },

  {	.freq			= 2437,

	RADIOREGS(0x58, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x85,

		  0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),

  },

  {	.freq			= 2442,

	RADIOREGS(0x5c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8a,

		  0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),

  },

  {	.freq			= 2447,

	RADIOREGS(0x5f, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8f,

		  0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),

  },

  {	.freq			= 2452,

	RADIOREGS(0x62, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x94,

		  0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),

  },

  {	.freq			= 2457,

	RADIOREGS(0x66, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x99,

		  0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),

  },

  {	.freq			= 2462,

	RADIOREGS(0x69, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x9e,

		  0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),

  },

  {	.freq			= 2467,

	RADIOREGS(0x6c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0xa3,

		  0x09, 0x0f, 0x05, 0x00, 0x05, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),

  },

  {	.freq			= 2472,

	RADIOREGS(0x70, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0xa8,

		  0x09, 0x0f, 0x05, 0x00, 0x05, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x61, 0x03,

		  0x00, 0x00, 0x00, 0xf0, 0x00),

	PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),

  },

drivers/net/wireless/b43/radio_2059.h

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ struct b43_phy_ht_channeltab_e_radio2059 { 
	u8 radio_syn41;

	u8 radio_syn43;

	u8 radio_syn47;

	u8 radio_syn4a;

	u8 radio_syn58;

	u8 radio_syn5a;

	u8 radio_syn6a;

	u8 radio_syn6d;

	u8 radio_syn6e;

	u8 radio_syn92;

	u8 radio_syn98;

	u8 radio_rxtx4a;

	u8 radio_rxtx58;

	u8 radio_rxtx5a;