Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9db3978 authored by Shengzhen Li's avatar Shengzhen Li Committed by Kalle Valo
Browse files

mwifiex: add default setting for pcie firmware download 



This patch adds default setting for pcie firmware download name in
case that there are newer chipset version.

Signed-off-by: default avatarShengzhen Li <szli@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e87650bc

drivers/net/wireless/marvell/mwifiex/pcie.c

+3 −0
Original line number Diff line number Diff line
@@ -2830,6 +2830,8 @@ static void mwifiex_pcie_get_fw_name(struct mwifiex_adapter *adapter) 
			strcpy(adapter->fw_name, PCIE8897_B0_FW_NAME);

			break;

		default:

			strcpy(adapter->fw_name, PCIE8897_DEFAULT_FW_NAME);



			break;

		}

		break;
@@ -2855,6 +2857,7 @@ static void mwifiex_pcie_get_fw_name(struct mwifiex_adapter *adapter) 
				       PCIEUART8997_FW_NAME_Z);

			break;

		default:

			strcpy(adapter->fw_name, PCIE8997_DEFAULT_FW_NAME);

			break;

		}

	default:

drivers/net/wireless/marvell/mwifiex/pcie.h

+2 −0
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ 
#include    "main.h"



#define PCIE8766_DEFAULT_FW_NAME "mrvl/pcie8766_uapsta.bin"

#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 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"