From cb52ede81d8bb09af8acde711e9a580cba633715 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 7 Jul 2015 13:48:06 +0000 Subject: [PATCH] mac80211: Drop ath10k workaround for providing calibration data Ath10k has now a proper method of providing calibration data via the kernel firmware API. This patch can be dropped as all boards now use the proper method. Signed-off-by: Matti Laakso SVN-Revision: 46245 --- ...back_to_board_bin_on_empty_otp_stream.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch diff --git a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch b/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch deleted file mode 100644 index 2626d780316..00000000000 --- a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/drivers/net/wireless/ath/ath10k/core.c -+++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -391,8 +391,13 @@ static int ath10k_download_and_run_otp(s - if (!(skip_otp || test_bit(ATH10K_FW_FEATURE_IGNORE_OTP_RESULT, - ar->fw_features)) - && result != 0) { -- ath10k_err(ar, "otp calibration failed: %d", result); -- return -EINVAL; -+ if (result == 2) { -+ ath10k_warn(ar, "otp stream is empty, using board.bin contents"); -+ return 0; -+ } else { -+ ath10k_err(ar, "otp calibration failed: %d", result); -+ return -EINVAL; -+ } - } - - return 0; -- 2.30.2