aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@kernel.org>2018-02-22 06:42:59 -0500
committerJosh Boyer <jwboyer@kernel.org>2018-02-22 06:42:59 -0500
commit7344ec9e1df9e27d105ed48d2db99e22370236de (patch)
tree873112ec55b3ab230323b4d5614df709c175de2e
parent6d5131107f2ba67a13f469ac770a55f101ba654d (diff)
parent9b3d016886a8e365f9493a724bf2945b97bcfe43 (diff)
Merge branch 'ath10k-20180219' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/linux-firmware into ath10k
Signed-off-by: Josh Boyer <jwboyer@kernel.org>
-rw-r--r--WHENCE14
-rw-r--r--ath10k/QCA4019/hw1.0/board-2.binbin109172 -> 133452 bytes
-rw-r--r--ath10k/QCA4019/hw1.0/firmware-5.binbin535412 -> 568636 bytes
-rw-r--r--ath10k/QCA6174/hw3.0/board-2.binbin501748 -> 551128 bytes
-rw-r--r--ath10k/QCA6174/hw3.0/firmware-6.binbin727776 -> 730788 bytes
-rw-r--r--ath10k/QCA9377/hw1.0/firmware-5.binbin605908 -> 783336 bytes
-rw-r--r--ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt4
-rw-r--r--ath10k/QCA9887/hw1.0/firmware-5.binbin235880 -> 237584 bytes
-rw-r--r--ath10k/QCA9888/hw2.0/firmware-5.binbin647460 -> 659708 bytes
-rw-r--r--ath10k/QCA988X/hw2.0/firmware-5.binbin248188 -> 248108 bytes
-rw-r--r--ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt25
-rw-r--r--ath10k/QCA9984/hw1.0/firmware-5.binbin622060 -> 647380 bytes
12 files changed, 20 insertions, 23 deletions
diff --git a/WHENCE b/WHENCE
index 80067b7..c8ec8e0 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2751,7 +2751,7 @@ File: ath10k/QCA988X/hw2.0/firmware-4.bin
Version: 10.2.4.45
Licence: ath10k/QCA988X/hw2.0/notice_ath10k_firmware-4.txt
File: ath10k/QCA988X/hw2.0/firmware-5.bin
-Version: 10.2.4.70.54
+Version: 10.2.4-1.0-00037
Licence: ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
File: ath10k/QCA6174/hw2.1/board.bin
File: ath10k/QCA6174/hw2.1/board-2.bin
@@ -2764,12 +2764,12 @@ File: ath10k/QCA6174/hw3.0/firmware-4.bin
Version: WLAN.RM.2.0-00180-QCARMSWPZ-1
Licence: ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
File: ath10k/QCA6174/hw3.0/firmware-6.bin
-Version: WLAN.RM.4.4.1-00051-QCARMSWP-1
+Version: WLAN.RM.4.4.1-00079-QCARMSWPZ-1
Licence: ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
File: ath10k/QCA9377/hw1.0/board.bin
File: ath10k/QCA9377/hw1.0/board-2.bin
File: ath10k/QCA9377/hw1.0/firmware-5.bin
-Version: WLAN.TF.1.0-00267-1
+Version: WLAN.TF.1.0-00002-QCATFSWPZ-5
Licence: ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
File: ath10k/QCA99X0/hw2.0/board.bin
File: ath10k/QCA99X0/hw2.0/firmware-5.bin
@@ -2777,19 +2777,19 @@ Version: 10.4.1.00030-1
Licence: ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt
File: ath10k/QCA4019/hw1.0/board-2.bin
File: ath10k/QCA4019/hw1.0/firmware-5.bin
-Version: 10.4-3.4-00082
+Version: 10.4-3.5.3-00053
Licence: ath10k/QCA4019/hw1.0/notice_ath10k_firmware-5.txt
File: ath10k/QCA9887/hw1.0/board.bin
File: ath10k/QCA9887/hw1.0/firmware-5.bin
-Version: 10.2.4-1.0-00029
+Version: 10.2.4-1.0-00037
Licence: ath10k/QCA9887/hw1.0/notice_ath10k_firmware-5.txt
File: ath10k/QCA9888/hw2.0/board-2.bin
File: ath10k/QCA9888/hw2.0/firmware-5.bin
-Version: 10.4-3.5.1-00014
+Version: 10.4-3.5.3-00053
Licence: ath10k/QCA9888/hw2.0/notice_ath10k_firmware-5.txt
File: ath10k/QCA9984/hw1.0/board-2.bin
File: ath10k/QCA9984/hw1.0/firmware-5.bin
-Version: 10.4-3.4-00082
+Version: 10.4-3.5.3-00053
Licence: ath10k/QCA9984/hw1.0/notice_ath10k_firmware-5.txt
Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details
diff --git a/ath10k/QCA4019/hw1.0/board-2.bin b/ath10k/QCA4019/hw1.0/board-2.bin
index a8b1f34..af0d153 100644
--- a/ath10k/QCA4019/hw1.0/board-2.bin
+++ b/ath10k/QCA4019/hw1.0/board-2.bin
Binary files differ
diff --git a/ath10k/QCA4019/hw1.0/firmware-5.bin b/ath10k/QCA4019/hw1.0/firmware-5.bin
index 9e0c7b8..6afa92c 100644
--- a/ath10k/QCA4019/hw1.0/firmware-5.bin
+++ b/ath10k/QCA4019/hw1.0/firmware-5.bin
Binary files differ
diff --git a/ath10k/QCA6174/hw3.0/board-2.bin b/ath10k/QCA6174/hw3.0/board-2.bin
index 10960ba..bba778a 100644
--- a/ath10k/QCA6174/hw3.0/board-2.bin
+++ b/ath10k/QCA6174/hw3.0/board-2.bin
Binary files differ
diff --git a/ath10k/QCA6174/hw3.0/firmware-6.bin b/ath10k/QCA6174/hw3.0/firmware-6.bin
index a05b26e..0a51238 100644
--- a/ath10k/QCA6174/hw3.0/firmware-6.bin
+++ b/ath10k/QCA6174/hw3.0/firmware-6.bin
Binary files differ
diff --git a/ath10k/QCA9377/hw1.0/firmware-5.bin b/ath10k/QCA9377/hw1.0/firmware-5.bin
index c32528c..3402ae5 100644
--- a/ath10k/QCA9377/hw1.0/firmware-5.bin
+++ b/ath10k/QCA9377/hw1.0/firmware-5.bin
Binary files differ
diff --git a/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt b/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
index f03849d..e10d807 100644
--- a/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
+++ b/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
@@ -12,7 +12,7 @@ express written agreement, this file provides no license to any patents,
trademarks, copyrights, or other intellectual property of Qualcomm Incorporated
or any of its subsidiaries.
-Copyright (c) 2015 Qualcomm Atheros, Inc. All rights reserved.
+Copyright (c) 2017 Qualcomm Atheros, Inc. All rights reserved.
Qualcomm is a trademark of Qualcomm Incorporated, registered in the
United States and other countries. All Qualcomm Incorporated trademarks
@@ -1125,4 +1125,4 @@ Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
* See README and COPYING for more details.
*/
- \ No newline at end of file
+
diff --git a/ath10k/QCA9887/hw1.0/firmware-5.bin b/ath10k/QCA9887/hw1.0/firmware-5.bin
index b03acb7..c2336ba 100644
--- a/ath10k/QCA9887/hw1.0/firmware-5.bin
+++ b/ath10k/QCA9887/hw1.0/firmware-5.bin
Binary files differ
diff --git a/ath10k/QCA9888/hw2.0/firmware-5.bin b/ath10k/QCA9888/hw2.0/firmware-5.bin
index 00069e5..8a831a6 100644
--- a/ath10k/QCA9888/hw2.0/firmware-5.bin
+++ b/ath10k/QCA9888/hw2.0/firmware-5.bin
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/firmware-5.bin b/ath10k/QCA988X/hw2.0/firmware-5.bin
index 3b008cb..fc7aea0 100644
--- a/ath10k/QCA988X/hw2.0/firmware-5.bin
+++ b/ath10k/QCA988X/hw2.0/firmware-5.bin
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt b/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
index 713648f..4ff240e 100644
--- a/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
+++ b/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
@@ -1,24 +1,21 @@
=============================================================================
-"This Notice.txt file contains certain notices of software components
-included with the software that Qualcomm Atheros, Inc. ("Qualcomm Atheros")
-is required to provide you. Except where prohibited by the open source license,
+This Notice.txt file contains certain notices of software components
+included with the software that Qualcomm Atheros, Inc. (Qualcomm Atheros)
+is required to provide you. Except where prohibited by the open source license,
the content of this notices file is only provided to satisfy Qualcomm Atheros's
attribution and notice requirement; your use of these software components together
-with the Qualcomm Atheros software (Qualcomm Atheros software hereinafter referred
-to as "Software") is subject to the terms of your agreement from Qualcomm Atheros.
-Compliance with all copyright laws and software license agreements included in the
-notice section of this file are the responsibility of the user. Except as may be
+with the Qualcomm Atheros software (Qualcomm Atheros software hereinafter referred
+to as Software) is subject to the terms of your agreement from Qualcomm Atheros.
+Compliance with all copyright laws and software license agreements included in the
+notice section of this file are the responsibility of the user. Except as may be
granted by separate express written agreement, this file provides no license to
-any patents, trademarks, copyrights, or other intellectual property of Qualcomm
-Incorporated or any of its subsidiaries.
-
-Copyright (c) 2015 Qualcomm Atheros, Inc. All rights reserved.
+any patents, trademarks, copyrights, or other intellectual property of Qualcomm
+Incorporated or any of its subsidiaries.
Qualcomm is a trademark of Qualcomm Incorporated, registered in the United States
and other countries. All Qualcomm Incorporated trademarks are used with permission.
-Atheros is a trademark of Qualcomm Atheros, Inc., registered in the United States
-and other countries. Other products and brand names may be trademarks or registered
-trademarks of their respective owners."
+Other products and brand names may be trademarks or registered trademarks of their
+respective owners.
=============================================================================
NOTICES:
diff --git a/ath10k/QCA9984/hw1.0/firmware-5.bin b/ath10k/QCA9984/hw1.0/firmware-5.bin
index 6db633d..ac39fe2 100644
--- a/ath10k/QCA9984/hw1.0/firmware-5.bin
+++ b/ath10k/QCA9984/hw1.0/firmware-5.bin
Binary files differ