b43: Add LP-PHY firmware loading support
PATCH v2 1/1 b43: Add LP-PHY firmware loading support
Add support for loading LP-PHY firmware to b43_try_request_fw.
---drivers/net/wireless/b43/main.c | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/main.c +0 -0
@@ -2062,8 +2062,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
filename = "ucode5"; else if ((rev >= 11) && (rev <= 12)) filename = "ucode11"; - else if (rev >= 13) + else if (rev == 13) filename = "ucode13"; + else if (rev == 14) + filename = "ucode14"; + else if (rev >= 15) + filename = "ucode15"; else goto err_no_ucode; err = b43_do_request_fw(ctx, filename, &fw->ucode); @@ -2111,6 +2115,16 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals; break;
+ case B43_PHYTYPE_LP:
+ if (rev == 13)
+ filename = "lp0initvals13";
+ else if (rev == 14)
+ filename = "lp0initvals14";
+ else if (rev >= 15)
+ filename = "lp0initvals15";
+ else
+ goto err_no_initvals;
+ break; default: goto err_no_initvals; } @@ -2145,6 +2159,15 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals; break;
+ case B43_PHYTYPE_LP:
+ if (rev == 13)
+ filename = "lp0bsinitvals13";
+ else if (rev == 14)
+ filename = "lp0bsinitvals14";
+ else if (rev >= 15)
+ filename = "lp0bsinitvals15";
+ else
+ goto err_no_initvals; default: goto err_no_initvals; }
Signature · 1 line
1.6.2.4
Still missing a break in the bandswitch initvals.
Mark
Quoted 62 lines · Gábor Stefanik
Add support for loading LP-PHY firmware to
b43_try_request_fw.Signed-off-by Gábor Stefanik <[email protected]>---
drivers/net/wireless/b43/main.c| 25 ++++++++++++++++++++++++-1 files changed, 24 insertions(+), 1 deletions(-)drivers/net/wireless/b43/main.c +5
-1@@ -2062,8 +2062,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) filename ="ucode5" ; else if ((rev >= 11) && (rev <= 12)) filename = "ucode11"; - else if (rev >= 13) + else if (rev == 13) filename = "ucode13"; + else if (rev == 14) + filename = "ucode14"; + else if (rev >= 15) + filename = "ucode15"; else goto err_no_ucode;err = b43_do_request_fw(ctx, filename, &fw->ucode);drivers/net/wireless/b43/main.c +10
-0@@ -2111,6 +2115,16 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals;break ; +case B43_PHYTYPE_LP : +if (rev ==13 ) + filename ="lp0initvals13" ; +else if (rev ==14 ) + filename ="lp0initvals14" ; +else if (rev >=15 ) + filename ="lp0initvals15" ; +else + goto err_no_initvals; +break ;default : goto err_no_initvals;}drivers/net/wireless/b43/main.c +9
-0@@ -2145,6 +2159,15 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals;break ; +case B43_PHYTYPE_LP : +if (rev ==13 ) + filename ="lp0bsinitvals13" ; +else if (rev ==14 ) + filename ="lp0bsinitvals14" ; +else if (rev >=15 ) + filename ="lp0bsinitvals15" ; +else + goto err_no_initvals;default : goto err_no_initvals;}