b43: Make LP-PHY testable
-Enable rate memory init for LP-PHY (same as G and N-PHY). -Mark rev.2 LP-PHYs with the B2063 radio as supported. -Allow using the 5GHz band on LP-PHYs. Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
759b973bb2
Коммит
9d86a2d531
|
@ -2589,6 +2589,7 @@ static void b43_rate_memory_init(struct b43_wldev *dev)
|
||||||
case B43_PHYTYPE_A:
|
case B43_PHYTYPE_A:
|
||||||
case B43_PHYTYPE_G:
|
case B43_PHYTYPE_G:
|
||||||
case B43_PHYTYPE_N:
|
case B43_PHYTYPE_N:
|
||||||
|
case B43_PHYTYPE_LP:
|
||||||
b43_rate_memory_write(dev, B43_OFDM_RATE_6MB, 1);
|
b43_rate_memory_write(dev, B43_OFDM_RATE_6MB, 1);
|
||||||
b43_rate_memory_write(dev, B43_OFDM_RATE_12MB, 1);
|
b43_rate_memory_write(dev, B43_OFDM_RATE_12MB, 1);
|
||||||
b43_rate_memory_write(dev, B43_OFDM_RATE_18MB, 1);
|
b43_rate_memory_write(dev, B43_OFDM_RATE_18MB, 1);
|
||||||
|
@ -3817,7 +3818,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_B43_PHY_LP
|
#ifdef CONFIG_B43_PHY_LP
|
||||||
case B43_PHYTYPE_LP:
|
case B43_PHYTYPE_LP:
|
||||||
if (phy_rev > 1)
|
if (phy_rev > 2)
|
||||||
unsupported = 1;
|
unsupported = 1;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
@ -3874,7 +3875,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
|
||||||
unsupported = 1;
|
unsupported = 1;
|
||||||
break;
|
break;
|
||||||
case B43_PHYTYPE_LP:
|
case B43_PHYTYPE_LP:
|
||||||
if (radio_ver != 0x2062)
|
if (radio_ver != 0x2062 && radio_ver != 0x2063)
|
||||||
unsupported = 1;
|
unsupported = 1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -4512,9 +4513,10 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||||
case B43_PHYTYPE_A:
|
case B43_PHYTYPE_A:
|
||||||
have_5ghz_phy = 1;
|
have_5ghz_phy = 1;
|
||||||
break;
|
break;
|
||||||
|
case B43_PHYTYPE_LP: //FIXME not always!
|
||||||
|
have_5ghz_phy = 1;
|
||||||
case B43_PHYTYPE_G:
|
case B43_PHYTYPE_G:
|
||||||
case B43_PHYTYPE_N:
|
case B43_PHYTYPE_N:
|
||||||
case B43_PHYTYPE_LP:
|
|
||||||
have_2ghz_phy = 1;
|
have_2ghz_phy = 1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -4529,7 +4531,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||||
}
|
}
|
||||||
if (1 /* disable A-PHY */) {
|
if (1 /* disable A-PHY */) {
|
||||||
/* FIXME: For now we disable the A-PHY on multi-PHY devices. */
|
/* FIXME: For now we disable the A-PHY on multi-PHY devices. */
|
||||||
if (dev->phy.type != B43_PHYTYPE_N) {
|
if (dev->phy.type != B43_PHYTYPE_N &&
|
||||||
|
dev->phy.type != B43_PHYTYPE_LP) {
|
||||||
have_2ghz_phy = 1;
|
have_2ghz_phy = 1;
|
||||||
have_5ghz_phy = 0;
|
have_5ghz_phy = 0;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче