b43: Add LP-PHY firmware loading support

Add support for loading LP-PHY firmware to b43_try_request_fw.

Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 25 insertions, 1 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index f6d039e303f4..2a75bebd3292 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1955,8 +1955,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);
@@ -2004,6 +2008,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;
         }
@@ -2038,6 +2052,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 = "lp0bsinitvals13";
+                else if (rev == 14)
+                        filename = "lp0bsinitvals14";
+                else if (rev >= 15)
+                        filename = "lp0bsinitvals15";
+                else
+                        goto err_no_initvals;
+                break;
         default:
                 goto err_no_initvals;
         }