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

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

Merge "wil6210: support Talyn specific FW file" into msm-4.14

parents 4eb7f2b9 6e60353f

drivers/net/wireless/ath/wil6210/pcie_bus.c

+8 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ int wil_set_capabilities(struct wil6210_priv *wil) 
		if (wil_r(wil, RGF_USER_OTP_HW_RD_MACHINE_1) &

		    BIT_NO_FLASH_INDICATION)

			set_bit(hw_capa_no_flash, wil->hw_capa);

		wil_fw_name = ftm_mode ? WIL_FW_NAME_FTM_TALYN :

			      WIL_FW_NAME_TALYN;

		if (wil_fw_verify_file_exists(wil, wil_fw_name))

			wil->wil_fw_name = wil_fw_name;

		break;

	case JTAG_DEV_ID_TALYN_MB:

		wil->hw_name = "Talyn-MB";
@@ -111,6 +115,10 @@ int wil_set_capabilities(struct wil6210_priv *wil) 
		wil->rgf_ucode_assert_code_addr = TALYN_RGF_UCODE_ASSERT_CODE;

		set_bit(hw_capa_no_flash, wil->hw_capa);

		wil->use_enhanced_dma_hw = use_enhanced_dma_hw;

		wil_fw_name = ftm_mode ? WIL_FW_NAME_FTM_TALYN :

			      WIL_FW_NAME_TALYN;

		if (wil_fw_verify_file_exists(wil, wil_fw_name))

			wil->wil_fw_name = wil_fw_name;

		break;

	default:

		wil_err(wil, "Unknown board hardware, chip_id 0x%08x, chip_revision 0x%08x\n",

drivers/net/wireless/ath/wil6210/wil6210.h

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ union wil_tx_desc; 
#define WIL_FW_NAME_SPARROW_PLUS "wil6210_sparrow_plus.fw"

#define WIL_FW_NAME_FTM_SPARROW_PLUS "wil6210_sparrow_plus_ftm.fw"



#define WIL_FW_NAME_TALYN "wil6436.fw"

#define WIL_FW_NAME_FTM_TALYN "wil6436_ftm.fw"



#define WIL_BOARD_FILE_NAME "wil6210.brd" /* board & radio parameters */



#define WIL_DEFAULT_BUS_REQUEST_KBPS 128000 /* ~1Gbps */