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

Commit da3c8bdc 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 the support to load a seprate board data file for FTM mode"

parents 5e99bf27 afce6b40

drivers/net/wireless/cnss/cnss.c

+10 −0
Original line number Diff line number Diff line
@@ -270,6 +270,8 @@ void cnss_setup_fw_files(u16 revision) 
			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf11.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_board_data, "utfbd11.bin",

			CNSS_MAX_FILE_NAME);

		break;



	case QCA6174_FW_1_3:
@@ -281,6 +283,8 @@ void cnss_setup_fw_files(u16 revision) 
			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf13.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_board_data, "utfbd13.bin",

			CNSS_MAX_FILE_NAME);

		break;



	case QCA6174_FW_2_0:
@@ -292,6 +296,8 @@ void cnss_setup_fw_files(u16 revision) 
			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf20.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_board_data, "utfbd20.bin",

			CNSS_MAX_FILE_NAME);

		break;



	case QCA6174_FW_3_0:
@@ -303,6 +309,8 @@ void cnss_setup_fw_files(u16 revision) 
			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf30.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_board_data, "utfbd30.bin",

			CNSS_MAX_FILE_NAME);

		break;



	default:
@@ -314,6 +322,8 @@ void cnss_setup_fw_files(u16 revision) 
			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_file, "utf.bin",

			CNSS_MAX_FILE_NAME);

		strlcpy(penv->fw_files.utf_board_data, "utfbd.bin",

			CNSS_MAX_FILE_NAME);

		break;

	}

}

include/net/cnss.h

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

	char otp_data[CNSS_MAX_FILE_NAME];

	char utf_file[CNSS_MAX_FILE_NAME];

	char utf_board_data[CNSS_MAX_FILE_NAME];

};



struct cnss_wlan_driver {