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

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

b43: bus: abstract SPROM 



SPROM is another frequently used struct. We decided to share SPROM
struct between ssb na bcma as long as we will not need any hacks.

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

drivers/net/wireless/b43/bus.c

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev) 
	dev->block_read = b43_bus_ssb_block_read;

	dev->block_write = b43_bus_ssb_block_write;



	dev->bus_sprom = &sdev->bus->sprom;



	dev->core_id = sdev->id.coreid;

	dev->core_rev = sdev->id.revision;

drivers/net/wireless/b43/bus.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ struct b43_bus_dev { 
	void (*block_write)(struct b43_bus_dev *dev, const void *buffer,

			    size_t count, u16 offset, u8 reg_width);



	struct ssb_sprom *bus_sprom;



	u16 core_id;

	u8 core_rev;

};

drivers/net/wireless/b43/leds.c

+4 −4
Original line number Diff line number Diff line
@@ -218,10 +218,10 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev, 
	struct ssb_bus *bus = dev->sdev->bus;

	u8 sprom[4];



	sprom[0] = bus->sprom.gpio0;

	sprom[1] = bus->sprom.gpio1;

	sprom[2] = bus->sprom.gpio2;

	sprom[3] = bus->sprom.gpio3;

	sprom[0] = dev->dev->bus_sprom->gpio0;

	sprom[1] = dev->dev->bus_sprom->gpio1;

	sprom[2] = dev->dev->bus_sprom->gpio2;

	sprom[3] = dev->dev->bus_sprom->gpio3;



	if (sprom[led_index] == 0xFF) {

		/* There is no LED information in the SPROM

drivers/net/wireless/b43/lo.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static u16 lo_measure_feedthrough(struct b43_wldev *dev, 
		rfover |= pga;

		rfover |= lna;

		rfover |= trsw_rx;

		if ((dev->sdev->bus->sprom.boardflags_lo & B43_BFL_EXTLNA)

		if ((dev->dev->bus_sprom->boardflags_lo & B43_BFL_EXTLNA)

		    && phy->rev > 6)

			rfover |= B43_PHY_RFOVERVAL_EXTLNA;
@@ -387,7 +387,7 @@ struct lo_g_saved_values { 
static void lo_measure_setup(struct b43_wldev *dev,

			     struct lo_g_saved_values *sav)

{

	struct ssb_sprom *sprom = &dev->sdev->bus->sprom;

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	struct b43_phy *phy = &dev->phy;

	struct b43_phy_g *gphy = phy->g;

	struct b43_txpower_lo_control *lo = gphy->lo_control;

drivers/net/wireless/b43/main.c

+5 −5
Original line number Diff line number Diff line
@@ -1427,9 +1427,9 @@ u8 b43_ieee80211_antenna_sanitize(struct b43_wldev *dev, 


	/* Get the mask of available antennas. */

	if (dev->phy.gmode)

		antenna_mask = dev->sdev->bus->sprom.ant_available_bg;

		antenna_mask = dev->dev->bus_sprom->ant_available_bg;

	else

		antenna_mask = dev->sdev->bus->sprom.ant_available_a;

		antenna_mask = dev->dev->bus_sprom->ant_available_a;



	if (!(antenna_mask & (1 << (antenna_nr - 1)))) {

		/* This antenna is not available. Fall back to default. */
@@ -2599,7 +2599,7 @@ static int b43_gpio_init(struct b43_wldev *dev) 
		mask |= 0x0180;

		set |= 0x0180;

	}

	if (dev->sdev->bus->sprom.boardflags_lo & B43_BFL_PACTRL) {

	if (dev->dev->bus_sprom->boardflags_lo & B43_BFL_PACTRL) {

		b43_write16(dev, B43_MMIO_GPIO_MASK,

			    b43_read16(dev, B43_MMIO_GPIO_MASK)

			    | 0x0200);
@@ -4204,7 +4204,7 @@ static void setup_struct_wldev_for_init(struct b43_wldev *dev) 


static void b43_bluetooth_coext_enable(struct b43_wldev *dev)

{

	struct ssb_sprom *sprom = &dev->sdev->bus->sprom;

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	u64 hf;



	if (!modparam_btcoex)
@@ -4318,7 +4318,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev) 
static int b43_wireless_core_init(struct b43_wldev *dev)

{

	struct ssb_bus *bus = dev->sdev->bus;

	struct ssb_sprom *sprom = &bus->sprom;

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	struct b43_phy *phy = &dev->phy;

	int err;

	u64 hf;