[firmware-nonfree] 04/05: atheros: Add all the ath10k firmware and board files

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit 51e7a0bde0f25eb299f463fa47a7a2a8a375e889
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 18 20:24:24 2015 +0100

    atheros: Add all the ath10k firmware and board files
---
 debian/changelog              |  5 +++--
 debian/config/atheros/LICENSE | 22 ++++++++++++++++++++--
 debian/config/atheros/defines | 39 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 266d200..31fde37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,9 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
   * amd-graphics: Include microcode for "Carrizo", "Fiji", "Tonga" and "Topaz"
     chips supported by the amdgpu driver
   * misc-nonfree: Update Chelsio T4 and T5 firmware to version 1.14.4.0
-  * atheros: Include firmware for Atheros AR3012 rev 11020100 and
-    Qualcomm Atheros QCA988X
+  * atheros: Include firmware for Atheros AR3012 rev 11020100 and for
+    Qualcomm Atheros QCA988X, QCA9XX0 and QCA6174 adapters supported by the
+    ath10k driver (Closes: #724970)
   * bnx2x: Include Broadcom NetXtreme II 10Gb 57710, 57711 and 57712 firmware
     version 7.12.30.0 (for Linux 4.3 onward)
   * brcm80211: Include firmware for many more chips supported by the
diff --git a/debian/config/atheros/LICENSE b/debian/config/atheros/LICENSE
index 59e04ea..bdf424e 100644
--- a/debian/config/atheros/LICENSE
+++ b/debian/config/atheros/LICENSE
@@ -40,8 +40,22 @@ License: Binary redistribution (Atheros)
  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: ath10k/QCA988X/hw2.0/firmware-4.bin
-Copyright: 2015, Qualcomm Atheros, Inc.
+Files: ath10k/QCA*/hw*/firmware-*.bin
+Copyright: 1986, Gary S. Brown
+           1988, 1991, 1993, The Regents of the University of California
+           1998, The NetBSD Foundation, Inc.
+           1998-2002, Red Hat, Inc.
+           1999-2006, Tensilica Inc.
+           2000-2001, Aaron D. Gifford
+           2002, Gary Thomas
+           2002-2004, Sam Leffler, Errno Consulting
+           2002-2013, Jouni Malinen
+           2003-2006, Marcus Geelnard
+           2006-2007, Atheros Communications Inc.
+           2010-2011, embWiSe Technologies
+           2011, Qualcomm Technologies, Inc.
+           2011-2015, Qualcomm Atheros, Inc.
+           2013, Synopsys, Inc.
 License: Binary redistribution (Qualcomm Atheros)
  All rights reserved.
  .
@@ -89,3 +103,7 @@ License: Binary redistribution (Qualcomm Atheros)
  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: ath10k/QCA*/hw*/board.bin
+Copyright: 2015, Qualcomm Atheros, Inc.
+License: Binary redistribution (Qualcomm Atheros)
diff --git a/debian/config/atheros/defines b/debian/config/atheros/defines
index f9444fb..3600d0b 100644
--- a/debian/config/atheros/defines
+++ b/debian/config/atheros/defines
@@ -21,7 +21,15 @@ files:
  ar7010.fw
  ar7010_1_1.fw
  ar9271.fw
+ ath10k/QCA6174/hw2.1/board.bin
+ ath10k/QCA6174/hw2.1/firmware-5.bin
+ ath10k/QCA6174/hw3.0/board.bin
+ ath10k/QCA6174/hw3.0/firmware-4.bin
+ ath10k/QCA988X/hw2.0/board.bin
  ath10k/QCA988X/hw2.0/firmware-4.bin
+ ath10k/QCA988X/hw2.0/firmware-5.bin
+ ath10k/QCA99X0/hw2.0/board.bin
+ ath10k/QCA99X0/hw2.0/firmware-5.bin
  ath3k-1.fw
  ath6k/AR6003.1/hw2.1.1/athwlan.bin
  ath6k/AR6003.1/hw2.1.1/bdata.SD31.bin
@@ -121,8 +129,37 @@ desc: Atheros AR7010 rev 1.1 firmware
 [ar9271.fw_base]
 desc: Atheros AR9271 firmware
 
-[ath10k/QCA988X/hw2.0/firmware-4.bin]
+[ath10k/QCA6174/hw2.1/board.bin_base]
+desc: Qualcomm Atheros QCA6174 rev 2.1 board configuration
+
+[ath10k/QCA6174/hw2.1/firmware-5.bin_base]
+desc: Qualcomm Atheros QCA6174 rev 2.1 firmware
+version: WLAN.RM.1.1-00141
+
+[ath10k/QCA6174/hw3.0/board.bin_base]
+desc: Qualcomm Atheros QCA6174 rev 3.0 board configuration
+
+[ath10k/QCA6174/hw3.0/firmware-4.bin_base]
+desc: Qualcomm Atheros QCA6174 rev 3.0 firmware
+version: WLAN.RM.2.0-00180-QCARMSWPZ-1
+
+[ath10k/QCA988X/hw2.0/board.bin_base]
+desc: Qualcomm Atheros QCA988X board configuration
+
+[ath10k/QCA988X/hw2.0/firmware-4.bin_base]
 desc: Qualcomm Atheros QCA988X firmware
+version: 10.2.4.45
+
+[ath10k/QCA988X/hw2.0/firmware-5.bin_base]
+desc: Qualcomm Atheros QCA988X firmware
+version: 10.2.4.70.9-2
+
+[ath10k/QCA99X0/hw2.0/board.bin_base]
+desc: Qualcomm Atheros QCA99X0 board configuration
+
+[ath10k/QCA99X0/hw2.0/firmware-5.bin_base]
+desc: Qualcomm Atheros QCA99X0 firmware
+version: 10.4.1.00030-1
 
 [ath3k-1.fw_base]
 desc: Atheros AR3011 firmware

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git