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

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

b43: move PHY reset code into PHY specific file 



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

drivers/net/wireless/b43/main.c

+1 −34
Original line number Original line Diff line number Diff line
@@ -3706,39 +3706,6 @@ static void b43_op_set_tsf(struct ieee80211_hw *hw, 
	mutex_unlock(&wl->mutex);

	mutex_unlock(&wl->mutex);

}

}





static void b43_put_phy_into_reset(struct b43_wldev *dev)

{

#ifdef CONFIG_B43_SSB

	u32 tmp;

#endif



	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		b43err(dev->wl,

		       "Putting PHY into reset not supported on BCMA\n");

		break;

#endif

#ifdef CONFIG_B43_SSB

	case B43_BUS_SSB:

		tmp = ssb_read32(dev->dev->sdev, SSB_TMSLOW);

		tmp &= ~B43_TMSLOW_GMODE;

		tmp |= B43_TMSLOW_PHYRESET;

		tmp |= SSB_TMSLOW_FGC;

		ssb_write32(dev->dev->sdev, SSB_TMSLOW, tmp);

		msleep(1);



		tmp = ssb_read32(dev->dev->sdev, SSB_TMSLOW);

		tmp &= ~SSB_TMSLOW_FGC;

		tmp |= B43_TMSLOW_PHYRESET;

		ssb_write32(dev->dev->sdev, SSB_TMSLOW, tmp);

		msleep(1);



		break;

#endif

	}

}



static const char *band_to_string(enum ieee80211_band band)

static const char *band_to_string(enum ieee80211_band band)

{

{

	switch (band) {

	switch (band) {
@@ -3804,7 +3771,7 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan) 
	if (down_dev != up_dev) {

	if (down_dev != up_dev) {

		/* We switch to a different core, so we put PHY into

		/* We switch to a different core, so we put PHY into

		 * RESET on the old core. */

		 * RESET on the old core. */

		b43_put_phy_into_reset(down_dev);

		b43_phy_put_into_reset(down_dev);

	}

	}





	/* Now start the new core. */

	/* Now start the new core. */

drivers/net/wireless/b43/phy_common.c

+33 −0
Original line number Original line Diff line number Diff line
@@ -312,6 +312,39 @@ void b43_phy_maskset(struct b43_wldev *dev, u16 offset, u16 mask, u16 set) 
	}

	}

}

}





void b43_phy_put_into_reset(struct b43_wldev *dev)

{

#ifdef CONFIG_B43_SSB

	u32 tmp;

#endif



	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		b43err(dev->wl,

		       "Putting PHY into reset not supported on BCMA\n");

		break;

#endif

#ifdef CONFIG_B43_SSB

	case B43_BUS_SSB:

		tmp = ssb_read32(dev->dev->sdev, SSB_TMSLOW);

		tmp &= ~B43_TMSLOW_GMODE;

		tmp |= B43_TMSLOW_PHYRESET;

		tmp |= SSB_TMSLOW_FGC;

		ssb_write32(dev->dev->sdev, SSB_TMSLOW, tmp);

		msleep(1);



		tmp = ssb_read32(dev->dev->sdev, SSB_TMSLOW);

		tmp &= ~SSB_TMSLOW_FGC;

		tmp |= B43_TMSLOW_PHYRESET;

		ssb_write32(dev->dev->sdev, SSB_TMSLOW, tmp);

		msleep(1);



		break;

#endif

	}

}



int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel)

int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel)

{

{

	struct b43_phy *phy = &(dev->phy);

	struct b43_phy *phy = &(dev->phy);

drivers/net/wireless/b43/phy_common.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -390,6 +390,8 @@ void b43_phy_lock(struct b43_wldev *dev); 
 */

 */

void b43_phy_unlock(struct b43_wldev *dev);

void b43_phy_unlock(struct b43_wldev *dev);





void b43_phy_put_into_reset(struct b43_wldev *dev);



/**

/**

 * b43_switch_channel - Switch to another channel

 * b43_switch_channel - Switch to another channel

 */

 */