Merge tag 'ca0132-fw-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/linux...

Firmware files for CA0132 HD-audio codec (v2)

This contains the external firmware files loaded by Creative CA0132
HD-audio codec driver.  The firmwares are used optionally since 3.9
kernel.

v1->v2: fix the installation path of ct*.bin firmware files

diff --git a/LICENCE.ca0132 b/LICENCE.ca0132
new file mode 100644 (file)
index 0000000..4324365
--- /dev/null
+++ b/LICENCE.ca0132
@@ -0,0 +1,48 @@
+01 Copyright (c) 2012, Creative Technology Ltd \r
+02 All rights reserved.\r
+03\r
+04 Redistribution.  Redistribution and use in binary form, without \r
+05 modification, are permitted provided that the following conditions are \r
+06 met:\r
+07\r
+08 * Redistributions must reproduce the above copyright notice and the \r
+09   following disclaimer in the documentation and/or other materials \r
+10   provided with the distribution. \r
+11 * Neither the name of Creative Technology Ltd or its affiliates ("CTL") \r
+12   nor the names of its suppliers may be used to endorse or promote \r
+13   products derived from this software without specific prior written \r
+14   permission. \r
+15 * No reverse engineering, decompilation, or disassembly of this software \r
+16   (or any part thereof) is permitted.\r
+17\r
+18 Limited patent license. CTL grants a limited, world-wide, \r
+19 royalty-free, non-exclusive license under patents it now or hereafter \r
+20 owns or controls to make, have made, use, import, offer to sell and \r
+21 sell ("Utilize") this software, but strictly only to the extent that any \r
+22 such patent is necessary to Utilize the software alone, or in \r
+23 combination with an operating system licensed under an approved Open \r
+24 Source license as listed by the Open Source Initiative at \r
+25 http://opensource.org/licenses.  The patent license shall not be \r
+26 applicable, to any other combinations which include this software.  \r
+27 No hardware per se is licensed hereunder.\r
+28\r
+29 DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND \r
+30 CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, \r
+31 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND \r
+32 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE \r
+33 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, \r
+34 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, \r
+35 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS \r
+36 OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND \r
+37 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR \r
+38 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE \r
+39 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH \r
+40 DAMAGE.\r
+41\r
+42 NO OTHER RIGHTS GRANTED. USER HEREBY ACKNOWLEDGES AND AGREES THAT USE OF \r
+43 THIS SOFTWARE SHALL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY \r
+44 IMPLICATION, ESTOPPEL, OR OTHERWISE TO ANY INTELLECTUAL PROPERTY RIGHTS \r
+45 (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) \r
+46 EMBODIED IN ANY OTHER CTL HARDWARE OR SOFTWARE WHETHER SOLELY OR IN \r
+47 COMBINATION WITH THIS SOFTWARE.\r
+\r

diff --git a/WHENCE b/WHENCE
index ae05cd1527dca7612801e99f9e332214b7b144ea..013f81045645dbbbd93ff4715cfd2b02079aa39a 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -2080,3 +2080,14 @@ Downloaded from http://linuxwireless.org/en/users/Drivers/carl9170
 Licence: GPLv2. Some build scripts use the New BSD (3-clause) licence.
 
 --------------------------------------------------------------------------
+
+Driver: snd-hda-codec-ca0132 - Creative Sound Core3D codec
+
+File: ctefx.bin
+File: ctspeq.bin
+
+Licence: Redistributable. See LICENCE.ca0132 for details
+
+Found also in alsa-firmware package.
+
+--------------------------------------------------------------------------

diff --git a/ctefx.bin b/ctefx.bin
new file mode 100644 (file)
index 0000000..a29458d
Binary files /dev/null and b/ctefx.bin differ

diff --git a/ctspeq.bin b/ctspeq.bin
new file mode 100644 (file)
index 0000000..dcf0203
Binary files /dev/null and b/ctspeq.bin differ