lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43: define firmwares for HT and LCN PHYs

Browse Source 
We were uploading different firmwares to the hardware until finding
responding one.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki
2011-07-07 18:58:24 +02:00
committed by John W. Linville
parent 42d9879550
commit 8b9bda759e
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/net/wireless/b43/main.c
View File

@@ -2159,6 +2159,8 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
u32 tmshigh; u32 tmshigh;
int err; int err;
/* Files for HT and LCN were found by trying one by one */
/* Get microcode */ /* Get microcode */
if ((rev >= 5) && (rev <= 10)) { if ((rev >= 5) && (rev <= 10)) {
filename = "ucode5"; filename = "ucode5";
@@ -2178,6 +2180,18 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
else else
goto err_no_ucode; goto err_no_ucode;
break; break;
case B43_PHYTYPE_HT:
if (rev == 29)
filename = "ucode29_mimo";
else
goto err_no_ucode;
break;
case B43_PHYTYPE_LCN:
if (rev == 24)
filename = "ucode24_mimo";
else
goto err_no_ucode;
break;
default: default:
goto err_no_ucode; goto err_no_ucode;
} }
@@ -2240,6 +2254,18 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
else else
goto err_no_initvals; goto err_no_initvals;
break; break;
case B43_PHYTYPE_HT:
if (rev == 29)
filename = "ht0initvals29";
else
goto err_no_initvals;
break;
case B43_PHYTYPE_LCN:
if (rev == 24)
filename = "lcn0initvals24";
else
goto err_no_initvals;
break;
default: default:
goto err_no_initvals; goto err_no_initvals;
} }
@@ -2287,6 +2313,18 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
else else
goto err_no_initvals; goto err_no_initvals;
break; break;
case B43_PHYTYPE_HT:
if (rev == 29)
filename = "ht0bsinitvals29";
else
goto err_no_initvals;
break;
case B43_PHYTYPE_LCN:
if (rev == 24)
filename = "lcn0bsinitvals24";
else
goto err_no_initvals;
break;
default: default:
goto err_no_initvals; goto err_no_initvals;
} }
@@ -4976,6 +5014,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
#endif #endif
case B43_PHYTYPE_G: case B43_PHYTYPE_G:
case B43_PHYTYPE_N: case B43_PHYTYPE_N:
case B43_PHYTYPE_HT:
case B43_PHYTYPE_LCN:
have_2ghz_phy = 1; have_2ghz_phy = 1;
break; break;
default: default: