Merge branch 'master' of git://git.marvell.com/mwifiex-firmware
* 'master' of git://git.marvell.com/mwifiex-firmware:
linux-firmware: add Marvell USB8897-B0 firmware combo image
linux-firmware: update Marvell SD8897-B0 firmware combo image
linux-firmware: update Marvell USB8797-B0 firmware image
Change-Id: I0e46445874bab35401128dcde3b643e5e3322052
diff --git a/LICENSE.qca_firmware b/LICENSE.qca_firmware
new file mode 100644
index 0000000..66cb23a
--- /dev/null
+++ b/LICENSE.qca_firmware
@@ -0,0 +1,44 @@
+Copyright (c) 2013 Qualcomm Atheros, Inc.
+
+All rights reserved.
+
+Redistribution and use in binary forms, without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+* Redistributions must reproduce the above copyright notice, this list
+ of conditions, and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of Qualcomm Atheros, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+* No Reverse engineering, decompiling, decrypting, or disassembling of
+ this software is permitted.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. NO LICENSES OR OTHER RIGHTS,
+WHETHER EXPRESS, IMPLIED, BASED ON ESTOPPEL OR OTHERWISE, ARE GRANTED
+TO ANY PARTY'S PATENTS, PATENT APPLICATIONS, OR PATENTABLE INVENTIONS
+BY VIRTUE OF THIS LICENSE OR THE DELIVERY OR PROVISION BY QUALCOMM
+ATHEROS, INC. OF THE SOFTWARE.
+
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR ANY CONTRIBUTOR BE LIABLE FOR
+ANY INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND REGARDLESS OF ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF OR RESULTING FROM THE USE OF THE
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ANY
+EVENT, THE TOTAL AGGREGATE LIABILITY THAT MAY BE IMPOSED ON QUALCOMM
+ATHEROS, INC. FOR ANY DIRECT DAMAGES ARISING UNDER OR RESULTING FROM
+THIS AGREEMENT OR IN CONNECTION WITH ANY USE OF THE SOFTWARE SHALL NOT
+EXCEED A TOTAL AMOUNT OF US$5.00.
+
+IF ANY OF THE ABOVE PROVISIONS ARE HELD TO BE VOID, INVALID,
+UNENFORCEABLE, OR ILLEGAL, THE OTHER PROVISIONS SHALL CONTINUE IN FULL
+FORCE AND EFFECT.
diff --git a/LICENSE.radeon b/LICENSE.radeon
index 0d1894f..fe3780b 100644
--- a/LICENSE.radeon
+++ b/LICENSE.radeon
@@ -1,4 +1,4 @@
-Copyright (C) 2009-2013 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (C) 2009-2014 Advanced Micro Devices, Inc. All rights reserved.
REDISTRIBUTION: Permission is hereby granted, free of any license fees,
to any person obtaining a copy of this microcode (the "Software"), to
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6a4b1f2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+ath10k-firmware
+===============
+
+Firmware files for ath10k, a mac80211 driver for QCA988x. The
+directory structure is:
+
+ * ath10k: the default firmware files, supports all modes
+ * ap: firmware images from the AP branch (STA specific features
+ might not work)
+
+For more information check the wiki:
+
+http://wireless.kernel.org/en/users/Drivers/ath10k/firmware
+
+
diff --git a/WHENCE b/WHENCE
index 23faafa..ba2c33f 100644
--- a/WHENCE
+++ b/WHENCE
@@ -738,6 +738,9 @@
File: mrvl/usb8897_uapsta.bin
Version: 15.68.201.p113
+File: mrvl/usb8897_uapsta.bin
+Version: 15.68.201.p113
+
File: mrvl/pcie8897_uapsta.bin
Version: 15.69.2.p11
@@ -812,9 +815,15 @@
File: iwlwifi-7260-7.ucode
Version: 22.1.7.0
+File: iwlwifi-7260-8.ucode
+Version: 22.15.8.0
+
File: iwlwifi-3160-7.ucode
Version: 22.1.7.0
+File: iwlwifi-3160-8.ucode
+Version: 22.15.8.0
+
Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
Also available from http://intellinuxwireless.org/?n=Downloads
@@ -1554,6 +1563,14 @@
File: radeon/KAVERI_pfp.bin
File: radeon/KAVERI_rlc.bin
File: radeon/KAVERI_sdma.bin
+File: radeon/HAWAII_ce.bin
+File: radeon/HAWAII_mc.bin
+File: radeon/HAWAII_me.bin
+File: radeon/HAWAII_mec.bin
+File: radeon/HAWAII_pfp.bin
+File: radeon/HAWAII_rlc.bin
+File: radeon/HAWAII_sdma.bin
+File: radeon/HAWAII_smc.bin
Licence: Redistributable. See LICENSE.radeon for details.
@@ -1920,6 +1937,19 @@
--------------------------------------------------------------------------
+Driver: r8723au - Realtek 802.11n WLAN driver for RTL8723AU
+
+Info: Taken from Realtek driver rtl8723A_WiFi_linux_v4.1.3_6044.20121224
+ Firmware is embedded in the driver as data statements. This info
+ has been extracted into a binary file.
+File: rtlwifi/rtl8723aufw_A.bin
+File: rtlwifi/rtl8723aufw_B.bin
+File: rtlwifi/rtl8723aufw_B_NoBT.bin
+
+Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
+
+--------------------------------------------------------------------------
+
Driver: rtl8188ee - Realtek 802.11n WLAN driver for RTL8188EE
Info: Taken from Realtek version rtl_92ce_92se_92de_8723ae_88ee_linux_mac80211_0010.0109.2013
diff --git a/ap/firmware-2.bin-10.1.389 b/ap/firmware-2.bin-10.1.389
new file mode 100644
index 0000000..4623227
--- /dev/null
+++ b/ap/firmware-2.bin-10.1.389
Binary files differ
diff --git a/ap/firmware-2.bin_10.1.467-1 b/ap/firmware-2.bin_10.1.467-1
new file mode 100644
index 0000000..ae0c99c
--- /dev/null
+++ b/ap/firmware-2.bin_10.1.467-1
Binary files differ
diff --git a/ap/untested/firmware-2.bin_10.1.436-1 b/ap/untested/firmware-2.bin_10.1.436-1
new file mode 100644
index 0000000..448de55
--- /dev/null
+++ b/ap/untested/firmware-2.bin_10.1.436-1
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/board.bin b/ath10k/QCA988X/hw2.0/board.bin
new file mode 100755
index 0000000..8f8bd6b
--- /dev/null
+++ b/ath10k/QCA988X/hw2.0/board.bin
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/firmware-2.bin b/ath10k/QCA988X/hw2.0/firmware-2.bin
new file mode 100644
index 0000000..069ee64
--- /dev/null
+++ b/ath10k/QCA988X/hw2.0/firmware-2.bin
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/firmware.bin b/ath10k/QCA988X/hw2.0/firmware.bin
new file mode 100755
index 0000000..08af68c
--- /dev/null
+++ b/ath10k/QCA988X/hw2.0/firmware.bin
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/otp.bin b/ath10k/QCA988X/hw2.0/otp.bin
new file mode 100755
index 0000000..94b11a2
--- /dev/null
+++ b/ath10k/QCA988X/hw2.0/otp.bin
Binary files differ
diff --git a/iwlwifi-3160-8.ucode b/iwlwifi-3160-8.ucode
new file mode 100644
index 0000000..7eee8e6
--- /dev/null
+++ b/iwlwifi-3160-8.ucode
Binary files differ
diff --git a/iwlwifi-7260-8.ucode b/iwlwifi-7260-8.ucode
new file mode 100644
index 0000000..354adeb
--- /dev/null
+++ b/iwlwifi-7260-8.ucode
Binary files differ
diff --git a/radeon/HAWAII_ce.bin b/radeon/HAWAII_ce.bin
new file mode 100644
index 0000000..7508a89
--- /dev/null
+++ b/radeon/HAWAII_ce.bin
Binary files differ
diff --git a/radeon/HAWAII_mc.bin b/radeon/HAWAII_mc.bin
new file mode 100644
index 0000000..38051f5
--- /dev/null
+++ b/radeon/HAWAII_mc.bin
Binary files differ
diff --git a/radeon/HAWAII_me.bin b/radeon/HAWAII_me.bin
new file mode 100644
index 0000000..4936b81
--- /dev/null
+++ b/radeon/HAWAII_me.bin
Binary files differ
diff --git a/radeon/HAWAII_mec.bin b/radeon/HAWAII_mec.bin
new file mode 100644
index 0000000..911247d
--- /dev/null
+++ b/radeon/HAWAII_mec.bin
Binary files differ
diff --git a/radeon/HAWAII_pfp.bin b/radeon/HAWAII_pfp.bin
new file mode 100644
index 0000000..77d0e2f
--- /dev/null
+++ b/radeon/HAWAII_pfp.bin
Binary files differ
diff --git a/radeon/HAWAII_rlc.bin b/radeon/HAWAII_rlc.bin
new file mode 100644
index 0000000..00c4b36
--- /dev/null
+++ b/radeon/HAWAII_rlc.bin
Binary files differ
diff --git a/radeon/HAWAII_sdma.bin b/radeon/HAWAII_sdma.bin
new file mode 100644
index 0000000..4766a2a
--- /dev/null
+++ b/radeon/HAWAII_sdma.bin
Binary files differ
diff --git a/radeon/HAWAII_smc.bin b/radeon/HAWAII_smc.bin
new file mode 100644
index 0000000..562b81e
--- /dev/null
+++ b/radeon/HAWAII_smc.bin
Binary files differ
diff --git a/rtlwifi/rtl8723aufw_A.bin b/rtlwifi/rtl8723aufw_A.bin
new file mode 100644
index 0000000..7accded
--- /dev/null
+++ b/rtlwifi/rtl8723aufw_A.bin
Binary files differ
diff --git a/rtlwifi/rtl8723aufw_B.bin b/rtlwifi/rtl8723aufw_B.bin
new file mode 100644
index 0000000..5c37400
--- /dev/null
+++ b/rtlwifi/rtl8723aufw_B.bin
Binary files differ
diff --git a/rtlwifi/rtl8723aufw_B_NoBT.bin b/rtlwifi/rtl8723aufw_B_NoBT.bin
new file mode 100644
index 0000000..8e9952c
--- /dev/null
+++ b/rtlwifi/rtl8723aufw_B_NoBT.bin
Binary files differ
