From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 30 May 2013 00:09:09 +0000 (+0100)
Subject: Merge branch 'go7007' of git://linuxtv.org/hverkuil/linux-firmware
X-Git-Tag: 20190312~720
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5aaee4c7a0c1e6d761dae16c40c04bdb64843a5;p=linux-firmware

Merge branch 'go7007' of git://linuxtv.org/hverkuil/linux-firmware

Hans Verkuil says:

The go7007 staging driver has been substantially overhauled for kernel 3.10.
As part of that process the firmware situation has been improved as well.

While Micronas allowed the firmware to be redistributed, it was never made
part of linux-firmware. Only the firmwares for the Sensoray S2250 were added
in the past, but those need the go7007*.bin firmwares as well to work.

This pull request collects all the firmwares necessary to support all the
go7007 devices into the go7007 directory. With this change the go7007 driver
will work out-of-the-box starting with kernel 3.10.
---

b5aaee4c7a0c1e6d761dae16c40c04bdb64843a5
diff --cc WHENCE
index ef64612,c988491..3864815
--- a/WHENCE
+++ b/WHENCE
@@@ -2119,28 -2109,25 +2117,53 @@@ Licence: Redistributable. See LICENCE.i
  
  --------------------------------------------------------------------------
  
 +Driver: btmtk_usb - Bluetooth USB driver
 +
 +File: mt7650.bin
 +
 +Licence: Redistributable. See LICENCE.ralink_a_mediatek_company_firmware for details
 +
 +--------------------------------------------------------------------------
 +
 +Driver: rp2 -- Comtrol RocketPort 2 serial driver
 +
 +File: rp2.fw
 +
 +Licence:
 +Copyright (C) 2013 Comtrol Corporation
 +
 +Comtrol grants permission to use and redistribute these firmware
 +files for use with Comtrol devices, 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.
 +
 +These firmware files are distributed in the hope that they will be
 +useful, but WITHOUT ANY WARRANTY; without even the implied warranty
 +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 +
 +--------------------------------------------------------------------------
++
+ Driver: go7007
+ 
+ File: go7007/s2250-1.fw
+ File: go7007/s2250-2.fw
+ 
+ Licence:
+   Sensoray grants permission to use and redistribute these firmware
+   files for use with Sensoray devices, but not as a 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.
+   These firmware files are distributed in the hope that they will be
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ File: go7007/go7007fw.bin
+ File: go7007/go7007tv.bin
+ File: go7007/lr192.fw
+ File: go7007/px-m402u.fw
+ File: go7007/px-tv402u.fw
+ File: go7007/wis-startrek.fw
+ 
+ Licence: Redistributable. See LICENCE.go7007_firmware for details
++
++--------------------------------------------------------------------------