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

Commit f6671e2d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "CNSS: Add mboxping firmware filename"

parents baaea74a 7df7afb4

drivers/net/wireless/cnss/cnss.c

+10 −5
Original line number Diff line number Diff line
@@ -69,15 +69,20 @@ 
#define AR900B_DEV_VERSION              0x1000000



static struct cnss_fw_files FW_FILES_QCA6174_FW_1_1 = {

"qwlan11.bin", "bdwlan11.bin", "otp11.bin", "utf11.bin", "utfbd11.bin"};

"qwlan11.bin", "bdwlan11.bin", "otp11.bin", "utf11.bin",

"utfbd11.bin", "epping11.bin"};

static struct cnss_fw_files FW_FILES_QCA6174_FW_2_0 = {

"qwlan20.bin", "bdwlan20.bin", "otp20.bin", "utf20.bin", "utfbd20.bin"};

"qwlan20.bin", "bdwlan20.bin", "otp20.bin", "utf20.bin",

"utfbd20.bin", "epping20.bin"};

static struct cnss_fw_files FW_FILES_QCA6174_FW_1_3 = {

"qwlan13.bin", "bdwlan13.bin", "otp13.bin", "utf13.bin", "utfbd13.bin"};

"qwlan13.bin", "bdwlan13.bin", "otp13.bin", "utf13.bin",

"utfbd13.bin", "epping13.bin"};

static struct cnss_fw_files FW_FILES_QCA6174_FW_3_0 = {

"qwlan30.bin", "bdwlan30.bin", "otp30.bin", "utf30.bin", "utfbd30.bin"};

"qwlan30.bin", "bdwlan30.bin", "otp30.bin", "utf30.bin",

"utfbd30.bin", "epping30.bin"};

static struct cnss_fw_files FW_FILES_DEFAULT = {

	"qwlan.bin", "bdwlan.bin", "otp.bin", "utf.bin", "utfbd.bin"};

"qwlan.bin", "bdwlan.bin", "otp.bin", "utf.bin",

"utfbd.bin", "epping.bin"};





#define WLAN_VREG_NAME		"vdd-wlan"

include/net/cnss.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct cnss_fw_files { 
	char otp_data[CNSS_MAX_FILE_NAME];

	char utf_file[CNSS_MAX_FILE_NAME];

	char utf_board_data[CNSS_MAX_FILE_NAME];

	char epping_file[CNSS_MAX_FILE_NAME];

};



struct cnss_wlan_driver {