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

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

b43: use radio ID reading code to older cores only 



Newer ones need separated way

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

drivers/net/wireless/b43/main.c

+23 −15
Original line number Diff line number Diff line
@@ -4218,6 +4218,9 @@ static int b43_phy_versioning(struct b43_wldev *dev) 
	       analog_type, phy_type, phy_rev);



	/* Get RADIO versioning */

	if (dev->dev->core_rev >= 24) {

		/* TODO */

	} else {

		if (dev->dev->chip_id == 0x4317) {

			if (dev->dev->chip_rev == 0)

				tmp = 0x3205017F;
@@ -4226,14 +4229,19 @@ static int b43_phy_versioning(struct b43_wldev *dev) 
			else

				tmp = 0x5205017F;

		} else {

		b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID);

			b43_write16(dev, B43_MMIO_RADIO_CONTROL,

				    B43_RADIOCTL_ID);

			tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);

		b43_write16(dev, B43_MMIO_RADIO_CONTROL, B43_RADIOCTL_ID);

		tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH) << 16;

			b43_write16(dev, B43_MMIO_RADIO_CONTROL,

				    B43_RADIOCTL_ID);

			tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH)

				<< 16;

		}

		radio_manuf = (tmp & 0x00000FFF);

		radio_ver = (tmp & 0x0FFFF000) >> 12;

		radio_rev = (tmp & 0xF0000000) >> 28;

	}



	if (radio_manuf != 0x17F /* Broadcom */)

		unsupported = 1;

	switch (phy_type) {