linux-firmware: rockchip: update dptx firmware to v2.6

Update firmware to v2.6, it support standby, controlled by mailbox
commend. And update the licence.

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Kyle McMartin <kyle@kernel.org>

diff --git a/LICENCE.rockchip b/LICENCE.rockchip
new file mode 100644 (file)
index 0000000..d23b4c4
--- /dev/null
+++ b/LICENCE.rockchip
@@ -0,0 +1,41 @@
+Copyright (c) 2016, Fuzhou Rockchip Electronics Co.Ltd
+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 Fuzhou Rockchip Electronics Co.Ltd, its products
+  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. Fuzhou Rockchip Electronics Co.Ltd 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 alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses.  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 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. 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/WHENCE b/WHENCE
index 307d239b67a2a738623d364990f485d6a62748c3..b45e9643a6a159e66f534b60a3c42b755ecdd6f5 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -3306,15 +3306,6 @@ OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 Driver: rk3399-dptx - ROCKCHIP rk3399 dptx firmware
 
 File: rockchip/dptx.bin
+Version: 2.6
 
-Licence: Redistributable.
-
-Rockchip Inc. grants permission to use and redistribute aforementioned firmware
-files for the use with devices containing Rockchip chipsets, but not as part of
-the Linux kernel or in any other form which would require these files themselves
-to be covered by the terms of the GNU General Public License or the GNU Lesser
-General Public License.
-
-These firmware files are distributed in the hope that they will be useful, but
-are provided WITHOUT ANY WARRANTY, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTY
-OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+Licence: Redistributable. See LICENCE.rockchip for details.

diff --git a/rockchip/dptx.bin b/rockchip/dptx.bin
index 042ec48d748a4a1e9b8174fa0d3fcc64bf2c562f..1f22d2c25d3fe1f5b242c73c363601f1ee0020f6 100644 (file)
Binary files a/rockchip/dptx.bin and b/rockchip/dptx.bin differ