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

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

b43: HT-PHY: Complete radio init (add missing entries) 



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

drivers/net/wireless/b43/phy_ht.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -160,8 +160,7 @@ static void b43_radio_2059_init(struct b43_wldev *dev) 
	/* Prepare (reset?) radio */

	/* Prepare (reset?) radio */

	b43_radio_2059_init_pre(dev);

	b43_radio_2059_init_pre(dev);





	b43_radio_write(dev, R2059_ALL | 0x51, 0x0070);

	r2059_upload_inittabs(dev);

	b43_radio_write(dev, R2059_ALL | 0x5a, 0x0003);





	for (i = 0; i < ARRAY_SIZE(routing); i++)

	for (i = 0; i < ARRAY_SIZE(routing); i++)

		b43_radio_set(dev, routing[i] | 0x146, 0x3);

		b43_radio_set(dev, routing[i] | 0x146, 0x3);

drivers/net/wireless/b43/radio_2059.c

+27 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,13 @@ 
#include "b43.h"

#include "b43.h"

#include "radio_2059.h"

#include "radio_2059.h"





/* Extracted from MMIO dump of 6.30.223.141 */

static u16 r2059_phy_rev1_init[][2] = {

	{ 0x051, 0x70 }, { 0x05a, 0x03 }, { 0x079, 0x01 }, { 0x082, 0x70 },

	{ 0x083, 0x00 }, { 0x084, 0x70 }, { 0x09a, 0x7f }, { 0x0b6, 0x10 },

	{ 0x188, 0x05 },

};



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

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

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

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

		  r20) \

		  r20) \
@@ -139,6 +146,26 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi 
  },

  },

};

};





void r2059_upload_inittabs(struct b43_wldev *dev)

{

	struct b43_phy *phy = &dev->phy;

	u16 *table = NULL;

	u16 size, i;



	switch (phy->rev) {

	case 1:

		table = r2059_phy_rev1_init[0];

		size = ARRAY_SIZE(r2059_phy_rev1_init);

		break;

	default:

		B43_WARN_ON(1);

		return;

	}



	for (i = 0; i < size; i++, table += 2)

		b43_radio_write(dev, R2059_ALL | table[0], table[1]);

}



const struct b43_phy_ht_channeltab_e_radio2059

const struct b43_phy_ht_channeltab_e_radio2059

*b43_phy_ht_get_channeltab_e_r2059(struct b43_wldev *dev, u16 freq)

*b43_phy_ht_get_channeltab_e_r2059(struct b43_wldev *dev, u16 freq)

{

{

drivers/net/wireless/b43/radio_2059.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ struct b43_phy_ht_channeltab_e_radio2059 { 
	struct b43_phy_ht_channeltab_e_phy phy_regs;

	struct b43_phy_ht_channeltab_e_phy phy_regs;

};

};





void r2059_upload_inittabs(struct b43_wldev *dev);



const struct b43_phy_ht_channeltab_e_radio2059

const struct b43_phy_ht_channeltab_e_radio2059

*b43_phy_ht_get_channeltab_e_r2059(struct b43_wldev *dev, u16 freq);

*b43_phy_ht_get_channeltab_e_r2059(struct b43_wldev *dev, u16 freq);