Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware:
radeon: add ucode for HAWAII GPUs
rtlwifi: Add firmware for r8723au
iwlwifi: update firmware for 7260 / 3160 devices
iwlwifi: update firmware for 7260 / 3160 devices
linux-firmware: 3.2.3.0 Firmware for Brocade Adapters
cxgb4: Updated T4 firmware, add T5 firmware
qla2xxx: Update ql2{4,5}00_fw.bin to version 7.01.00
linux-firmware: Update Intel Bluetooth devices firmware patch files
firmware: cw1200: Add firmware for the ST-E CW1200 WLAN chipset.
emi62: Provide the correct bitstream
Change-Id: I9677bbcf1cc226faa817344165986b80fb27d7f9
diff --git a/LICENCE.cw1200 b/LICENCE.cw1200
new file mode 100644
index 0000000..1016eca
--- /dev/null
+++ b/LICENCE.cw1200
@@ -0,0 +1,35 @@
+Copyright (c) 2007-2013, ST Microelectronics NV.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions must reproduce the above copyright notice and the following
+disclaimer in the documentation and/or other materials provided with the
+distribution.
+
+* Neither the name of ST Microelectronics NV. nor the names of its suppliers
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+* No reverse engineering, decompilation, or disassembly of this software is
+permitted.
+
+Limited patent license. ST Microelectronics NV. grants a world-wide, royalty-free,
+ non-exclusive license under patents it now or hereafter owns or controls to make,
+ have made, use, import, offer to sell and sell ("Utilize") this software, but
+ solely to the extent that any such patent is necessary to Utilize the software in
+conjunction with an ST Microelectronics chipset. The patent license shall not
+apply to any other combinations which include this software. No hardware per se
+is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ANDCONTRIBUTORS
+"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. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, 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 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.
diff --git a/LICENCE.qla2xxx b/LICENCE.qla2xxx
index f669ae0..df67a9b 100644
--- a/LICENCE.qla2xxx
+++ b/LICENCE.qla2xxx
@@ -1,39 +1,31 @@
-Copyright (c) 2003-2006 QLogic Corporation
-QLogic Linux Fibre Channel HBA Firmware
+Copyright (c) 2003-2010 QLogic Corporation
+QLogic Linux Fibre Channel Adapter Firmware
-You may redistribute the hardware specific firmware binary file
-under the following terms:
+Redistribution and use in binary form, without modification, for use in conjunction
+with QLogic authorized products is permitted provided that the following conditions
+are met:
- 1. Redistribution of source code (only if applicable),
- must retain the above copyright notice, this list of
- conditions and the following disclaimer.
+1. Redistribution in binary form 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.
+2. The name of QLogic Corporation may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+3. Reverse engineering, decompilation, or disassembly of this firmware is not
+ permitted.
- 2. Redistribution in binary form 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.
+REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,THIS PROGRAM IS
+PROVIDED BY QLOGIC CORPORATION "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. IN NO EVENT SHALL THE AUTHOR
+BE LIABLE FOR ANY DIRECT, 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 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.
- 3. The name of QLogic Corporation may not be used to
- endorse or promote products derived from this software
- without specific prior written permission
-
-REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
-THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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. IN NO EVENT SHALL THE AUTHOR
-BE LIABLE FOR ANY DIRECT, 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 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.
-
-USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
-CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
-OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
-TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
-ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
+USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT CREATE OR GIVE
+GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL
+PROPERTY RIGHTS (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY
+RIGHT) EMBODIED IN ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
COMBINATION WITH THIS PROGRAM.
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/WHENCE b/WHENCE
index eba58fa..934a581 100644
--- a/WHENCE
+++ b/WHENCE
@@ -429,9 +429,9 @@
File: ql2322_fw.bin
Version: 3.03.28 IPX
File: ql2400_fw.bin
-Version: 5.08.00 MID
+Version: 7.01.00 MID
File: ql2500_fw.bin
-Version: 5.08.00 MIDQ
+Version: 7.01.00 MIDQ
Licence: Redistributable. See LICENCE.qla2xxx for details
@@ -565,10 +565,12 @@
--------------------------------------------------------------------------
-Driver: cxgb4 - Chelsio Terminator 4 1G/10G Ethernet adapter
+Driver: cxgb4 - Chelsio Terminator 4/5 1G/10/40G Ethernet adapter
-File: cxgb4/t4fw-1.6.2.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.6.2.0.bin
+File: cxgb4/t4fw-1.9.23.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.9.23.0.bin
+File: cxgb4/t5fw-1.9.23.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.9.23.0.bin
Licence: Redistributable. See LICENCE.chelsio_firmware for details
@@ -808,10 +810,16 @@
Version: 18.168.6.1
File: iwlwifi-7260-7.ucode
-Version: 22.0.7.0
+Version: 22.1.7.0
+
+File: iwlwifi-7260-8.ucode
+Version: 22.15.8.0
File: iwlwifi-3160-7.ucode
-Version: 22.0.7.0
+Version: 22.1.7.0
+
+File: iwlwifi-3160-8.ucode
+Version: 22.15.8.0
Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
@@ -1552,6 +1560,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.
@@ -1918,6 +1934,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
@@ -2201,9 +2230,9 @@
File: intel/ibt-hw-37.7.bseq
Version: 1316.02.00
File: intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
-Version: 1334.02.2E
+Version: 1344.01.33
File: intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
-Version: 1334.02.2E
+Version: 1344.01.33
Licence: Redistributable. See LICENCE.ibt_firmware for details
@@ -2307,6 +2336,10 @@
Driver: cw1200 - ST-E CW1100/CW1200 WLAN driver
+File: wsm_22.bin
+Version: WSM395
+Licence: Redistributable. See LICENSE.cw1200 for details.
+
File: sdd_sagrad_1091_1098.bin
License:
@@ -2321,8 +2354,7 @@
part of Linux or other Open Source operating system kernel in text or
binary form as required.
- (Please note that the actual device firmware is separately licensed by
- ST-E, who has not provided explicit permission for general redistibution)
+ (Please note that the actual device firmware is separately licensed)
--------------------------------------------------------------------------
@@ -2331,6 +2363,9 @@
File: cbfw-3.2.1.1.bin
FIle: ctfw-3.2.1.1.bin
FIle: ct2fw-3.2.1.1.bin
+File: cbfw-3.2.3.0.bin
+FIle: ctfw-3.2.3.0.bin
+FIle: ct2fw-3.2.3.0.bin
Licence:
diff --git a/cbfw-3.2.3.0.bin b/cbfw-3.2.3.0.bin
new file mode 100644
index 0000000..bec4608
--- /dev/null
+++ b/cbfw-3.2.3.0.bin
Binary files differ
diff --git a/ct2fw-3.2.3.0.bin b/ct2fw-3.2.3.0.bin
new file mode 100644
index 0000000..cfe5ce9
--- /dev/null
+++ b/ct2fw-3.2.3.0.bin
Binary files differ
diff --git a/ctfw-3.2.3.0.bin b/ctfw-3.2.3.0.bin
new file mode 100644
index 0000000..fba2dd7
--- /dev/null
+++ b/ctfw-3.2.3.0.bin
Binary files differ
diff --git a/cxgb4/t4fw-1.6.2.0.bin b/cxgb4/t4fw-1.6.2.0.bin
deleted file mode 100644
index cf2b50f..0000000
--- a/cxgb4/t4fw-1.6.2.0.bin
+++ /dev/null
Binary files differ
diff --git a/cxgb4/t4fw-1.9.23.0.bin b/cxgb4/t4fw-1.9.23.0.bin
new file mode 100644
index 0000000..424867d
--- /dev/null
+++ b/cxgb4/t4fw-1.9.23.0.bin
Binary files differ
diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin
index 830cc68..0d51c41 120000
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@@ -1 +1 @@
-t4fw-1.6.2.0.bin
\ No newline at end of file
+t4fw-1.9.23.0.bin
\ No newline at end of file
diff --git a/cxgb4/t5fw-1.9.23.0.bin b/cxgb4/t5fw-1.9.23.0.bin
new file mode 100644
index 0000000..4bb2254
--- /dev/null
+++ b/cxgb4/t5fw-1.9.23.0.bin
Binary files differ
diff --git a/cxgb4/t5fw.bin b/cxgb4/t5fw.bin
new file mode 120000
index 0000000..e9f5afe
--- /dev/null
+++ b/cxgb4/t5fw.bin
@@ -0,0 +1 @@
+t5fw-1.9.23.0.bin
\ No newline at end of file
diff --git a/emi62/bitstream.fw b/emi62/bitstream.fw
index 221abfd..721d9af 100644
--- a/emi62/bitstream.fw
+++ b/emi62/bitstream.fw
Binary files differ
diff --git a/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq b/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
index cd23169..4955488 100644
--- a/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
+++ b/intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
Binary files differ
diff --git a/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq b/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
index 44736e4..ac13fab 100644
--- a/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
+++ b/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
Binary files differ
diff --git a/iwlwifi-3160-7.ucode b/iwlwifi-3160-7.ucode
index f6646d5..317b8d3 100644
--- a/iwlwifi-3160-7.ucode
+++ b/iwlwifi-3160-7.ucode
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-7.ucode b/iwlwifi-7260-7.ucode
index 324c7f2..8967f03 100644
--- a/iwlwifi-7260-7.ucode
+++ b/iwlwifi-7260-7.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/ql2400_fw.bin b/ql2400_fw.bin
index 5f1eb98..caa9ec4 100644
--- a/ql2400_fw.bin
+++ b/ql2400_fw.bin
Binary files differ
diff --git a/ql2500_fw.bin b/ql2500_fw.bin
index dd9f1ad..44508d0 100644
--- a/ql2500_fw.bin
+++ b/ql2500_fw.bin
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
diff --git a/wsm_22.bin b/wsm_22.bin
new file mode 100644
index 0000000..c428865
--- /dev/null
+++ b/wsm_22.bin
Binary files differ
