Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware
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/WHENCE b/WHENCE
index d7a0bfc..1845a8f 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
@@ -729,11 +729,14 @@
File: mrvl/sd8797_uapsta.bin
Version: 14.66.11.p151
+File: mrvl/sd8897_uapsta.bin
+Version: 15.69.2.p11
+
File: mrvl/usb8797_uapsta.bin
Version: 14.69.11.p179
File: mrvl/pcie8897_uapsta.bin
-Version: 15.69.201.p52
+Version: 15.69.2.p11
Licence: Redistributable. See LICENCE.Marvell for details. Originates from
http://git.marvell.com/?p=mwifiex-firmware.git
@@ -2197,9 +2200,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
@@ -2303,6 +2306,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:
@@ -2317,8 +2324,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)
--------------------------------------------------------------------------
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/mrvl/pcie8897_uapsta.bin b/mrvl/pcie8897_uapsta.bin
index b067689..858c100 100644
--- a/mrvl/pcie8897_uapsta.bin
+++ b/mrvl/pcie8897_uapsta.bin
Binary files differ
diff --git a/mrvl/sd8897_uapsta.bin b/mrvl/sd8897_uapsta.bin
new file mode 100644
index 0000000..70732a6
--- /dev/null
+++ b/mrvl/sd8897_uapsta.bin
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/wsm_22.bin b/wsm_22.bin
new file mode 100644
index 0000000..c428865
--- /dev/null
+++ b/wsm_22.bin
Binary files differ
