mwifiex: Change default firmware for PCIe8997 chipset

PCIe-USB8997 variant is being used in the product. Let's change default
firmware from PCIe-UART to PCIe-USB. So by default PCIe-USB firmware would
be downloaded if version register doesn't give any information.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 1b1e266ce00f11d0a3d4eb3deee17fb970a3efc6..012733c195658ee24878734f4d4b65416e18e2e9 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2841,20 +2841,20 @@ static void mwifiex_pcie_get_fw_name(struct mwifiex_adapter *adapter)
                version &= 0x7;
                switch (revision_id) {
                case PCIE8997_V2:
-                       if (version == CHIP_VER_PCIEUSB)
+                       if (version == CHIP_VER_PCIEUART)
                                strcpy(adapter->fw_name,
-                                      PCIEUSB8997_FW_NAME_V2);
+                                      PCIEUART8997_FW_NAME_V2);
                        else
                                strcpy(adapter->fw_name,
-                                      PCIEUART8997_FW_NAME_V2);
+                                      PCIEUSB8997_FW_NAME_V2);
                        break;
                case PCIE8997_Z:
-                       if (version == CHIP_VER_PCIEUSB)
+                       if (version == CHIP_VER_PCIEUART)
                                strcpy(adapter->fw_name,
-                                      PCIEUSB8997_FW_NAME_Z);
+                                      PCIEUART8997_FW_NAME_Z);
                        else
                                strcpy(adapter->fw_name,
-                                      PCIEUART8997_FW_NAME_Z);
+                                      PCIEUSB8997_FW_NAME_Z);
                        break;
                default:
                        strcpy(adapter->fw_name, PCIE8997_DEFAULT_FW_NAME);

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 9c00c7ea7eccc50d11fdccaf680fa5668886da2a..f05061cea5cd5a0882084c29d8919fa261344a47 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -32,7 +32,7 @@
 #define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
 #define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
 #define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
-#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieuart8997_combo_v2.bin"
+#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
 #define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
 #define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
 #define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
@@ -48,7 +48,7 @@
 #define PCIE8897_B0    0x1200
 #define PCIE8997_Z     0x0
 #define PCIE8997_V2    0x471
-#define CHIP_VER_PCIEUSB       0x2
+#define CHIP_VER_PCIEUART      0x3
 
 /* Constants for Buffer Descriptor (BD) rings */
 #define MWIFIEX_MAX_TXRX_BD                    0x20