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

b43: use one shared function for setting MAC frequency 



By the way add few chipsets that were tracked with "wl" dumps.

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

drivers/net/wireless/b43/main.c

+39 −0
Original line number Diff line number Diff line
@@ -2964,6 +2964,45 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on) 
	}

}



/* brcms_b_switch_macfreq */

void b43_mac_switch_freq(struct b43_wldev *dev, u8 spurmode)

{

	u16 chip_id = dev->dev->chip_id;



	if (chip_id == BCMA_CHIP_ID_BCM43217 ||

	    chip_id == BCMA_CHIP_ID_BCM43222 ||

	    chip_id == BCMA_CHIP_ID_BCM43224 ||

	    chip_id == BCMA_CHIP_ID_BCM43225 ||

	    chip_id == BCMA_CHIP_ID_BCM43227 ||

	    chip_id == BCMA_CHIP_ID_BCM43228) {

		switch (spurmode) {

		case 2: /* 126 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x2082);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

			break;

		case 1: /* 123 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x5341);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

			break;

		default: /* 120 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x8889);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

			break;

		}

	} else if (dev->phy.type == B43_PHYTYPE_LCN) {

		switch (spurmode) {

		case 1: /* 82 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x7CE0);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0xC);

			break;

		default: /* 80 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0xCCCD);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0xC);

			break;

		}

	}

}



static void b43_adjust_opmode(struct b43_wldev *dev)

{

	struct b43_wl *wl = dev->wl;

drivers/net/wireless/b43/main.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags); 
void b43_mac_suspend(struct b43_wldev *dev);

void b43_mac_enable(struct b43_wldev *dev);

void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on);

void b43_mac_switch_freq(struct b43_wldev *dev, u8 spurmode);





struct b43_request_fw_context;

drivers/net/wireless/b43/phy_lcn.c

+1 −34
Original line number Diff line number Diff line
@@ -54,39 +54,6 @@ enum lcn_sense_type { 
	B43_SENSE_VBAT,

};



/* In theory it's PHY common function, move if needed */

/* brcms_b_switch_macfreq */

static void b43_phy_switch_macfreq(struct b43_wldev *dev, u8 spurmode)

{

	if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) {

		switch (spurmode) {

		case 2:		/* 126 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x2082);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

			break;

		case 1:		/* 123 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x5341);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

			break;

		default:	/* 120 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x8889);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

			break;

		}

	} else if (dev->phy.type == B43_PHYTYPE_LCN) {

		switch (spurmode) {

		case 1:		/* 82 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0x7CE0);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0xC);

			break;

		default:	/* 80 Mhz */

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW, 0xCCCD);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0xC);

			break;

		}

	}

}



/**************************************************

 * Radio 2064.

 **************************************************/
@@ -609,7 +576,7 @@ static void b43_phy_lcn_txrx_spur_avoidance_mode(struct b43_wldev *dev, 
		b43_phy_write(dev, 0x93b, ((0 << 13) + 23));

		b43_phy_write(dev, 0x93c, ((0 << 13) + 1989));

	}

	b43_phy_switch_macfreq(dev, enable);

	b43_mac_switch_freq(dev, enable);

}



/**************************************************

drivers/net/wireless/b43/phy_n.c

+1 −6
Original line number Diff line number Diff line
@@ -6113,12 +6113,7 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev, 


		b43_nphy_pmu_spur_avoid(dev, avoid);



		if (dev->dev->chip_id == 43222 || dev->dev->chip_id == 43224 ||

		    dev->dev->chip_id == 43225) {

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW,

				    avoid ? 0x5341 : 0x8889);

			b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);

		}

		b43_mac_switch_freq(dev, avoid);



		if (dev->phy.rev == 3 || dev->phy.rev == 4)

			; /* TODO: reset PLL */

include/linux/bcma/bcma.h

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ struct bcma_host_ops { 
#define BCMA_CHIP_ID_BCM4313	0x4313

#define BCMA_CHIP_ID_BCM43142	43142

#define BCMA_CHIP_ID_BCM43217	43217

#define BCMA_CHIP_ID_BCM43222	43222

#define BCMA_CHIP_ID_BCM43224	43224

#define  BCMA_PKG_ID_BCM43224_FAB_CSM	0x8

#define  BCMA_PKG_ID_BCM43224_FAB_SMIC	0xa