Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f17578de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

parents 682e852e cec41834

Documentation/dvb/avermedia.txt

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ Getting the card going 


   The frontend module sp887x.o, requires an external   firmware.

   Please use  the  command "get_dvb_firmware sp887x" to download

   it. Then copy it to /usr/lib/hotplug/firmware.

   it. Then copy it to /usr/lib/hotplug/firmware or /lib/firmware/

   (depending on configuration of firmware hotplug).



Receiving DVB-T in Australia

Documentation/dvb/get_dvb_firmware

+20 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ use IO::Handle; 


@components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t",

		"dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",

		"or51211", "or51132_qam", "or51132_vsb");

		"or51211", "or51132_qam", "or51132_vsb", "bluebird");



# Check args

syntax() if (scalar(@ARGV) != 1);
@@ -34,7 +34,11 @@ for ($i=0; $i < scalar(@components); $i++) { 
    if ($cid eq $components[$i]) {

	$outfile = eval($cid);

	die $@ if $@;

	print STDERR "Firmware $outfile extracted successfully. Now copy it to either /lib/firmware or /usr/lib/hotplug/firmware/ (depending on your hotplug version).\n";

	print STDERR <<EOF;

Firmware $outfile extracted successfully.

Now copy it to either /usr/lib/hotplug/firmware or /lib/firmware

(depending on configuration of firmware hotplug).

EOF

	exit(0);

    }

}
@@ -308,6 +312,19 @@ sub or51132_vsb { 
    $fwfile;

}



sub bluebird {

	my $url = "http://www.linuxtv.org/download/dvb/firmware/dvb-usb-bluebird-01.fw";

	my $outfile = "dvb-usb-bluebird-01.fw";

	my $hash = "658397cb9eba9101af9031302671f49d";



	checkstandard();



	wgetfile($outfile, $url);

	verify($outfile,$hash);



	$outfile;

}



# ---------------------------------------------------------------

# Utilities

Documentation/dvb/ttusb-dec.txt

+2 −1
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ Hotplug Firmware Loading for 2.6 kernels 
For 2.6 kernels the firmware is loaded at the point that the driver module is

loaded.  See linux/Documentation/dvb/firmware.txt for more information.



Copy the three files downloaded above into the /usr/lib/hotplug/firmware directory.
 
Copy the three files downloaded above into the /usr/lib/hotplug/firmware or

/lib/firmware directory (depending on configuration of firmware hotplug).

Documentation/video4linux/CARDLIST.bttv

+1 −0
Original line number Diff line number Diff line
@@ -141,3 +141,4 @@ 
140 -> Osprey 440                                          [0070:ff07]

141 -> Asound Skyeye PCTV

142 -> Sabrent TV-FM (bttv version)

143 -> Hauppauge ImpactVCB (bt878)                         [0070:13eb]

Documentation/video4linux/CARDLIST.cx88

+9 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 15 -> DViCO FusionHDTV DVB-T1                             [18ac:db00]

 16 -> KWorld LTV883RF

 17 -> DViCO FusionHDTV 3 Gold-Q                           [18ac:d810]

 18 -> Hauppauge Nova-T DVB-T                              [0070:9002]

 18 -> Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001]

 19 -> Conexant DVB-T reference design                     [14f1:0187]

 20 -> Provideo PV259                                      [1540:2580]

 21 -> DViCO FusionHDTV DVB-T Plus                         [18ac:db10]
@@ -35,3 +35,11 @@ 
 34 -> ATI HDTV Wonder                                     [1002:a101]

 35 -> WinFast DTV1000-T                                   [107d:665f]

 36 -> AVerTV 303 (M126)                                   [1461:000a]

 37 -> Hauppauge Nova-S-Plus DVB-S                         [0070:9201,0070:9202]

 38 -> Hauppauge Nova-SE2 DVB-S                            [0070:9200]

 39 -> KWorld DVB-S 100                                    [17de:08b2]

 40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid                [0070:9400,0070:9402]

 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]

 42 -> digitalnow DNTV Live! DVB-T Pro                     [1822:0025]

 43 -> KWorld/VStream XPert DVB-T with cx22702             [17de:08a1]

 44 -> DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50]