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

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

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (707 commits)
  V4L/DVB (11316): saa7191: tuner ops wasn't set.
  V4L/DVB (11315): cx25840: fix 'unused variable' warning.
  V4L/DVB (11314): au8522: remove unused I2C_DRIVERID
  V4L/DVB (11313): v4l2-subdev: add enum_framesizes and enum_frameintervals.
  V4L/DVB (11312): tuner: remove V4L1 code from this driver.
  V4L/DVB (11311): v4l: replace 'ioctl' references in v4l i2c drivers
  V4L/DVB (11310): cx18: remove intermediate 'ioctl' step
  V4L/DVB (11309): cx25840: cleanup: remove intermediate 'ioctl' step
  V4L/DVB (11308): msp3400: use the V4L2 header since no V4L1 code is there
  V4L/DVB (11305): cx88: prevent probing rtc and ir devices
  V4L/DVB (11304): v4l2: remove v4l2_subdev_command calls where they are no longer needed.
  V4L/DVB (11303): tda7432: remove legacy code for old-style i2c API
  V4L/DVB (11302): tda9875: remove legacy code for old-style i2c API
  V4L/DVB (11301): wm8775: remove legacy code for old-style i2c API
  V4L/DVB (11300): cx88: convert to v4l2_subdev.
  V4L/DVB (11298): cx25840: remove legacy code for old-style i2c API
  V4L/DVB (11297): cx23885: convert to v4l2_subdev.
  V4L/DVB (11296): cx23885: bugfix error message if firmware is not found
  V4L/DVB (11295): cx23885: convert to v4l2_device.
  V4L/DVB (11293): uvcvideo: Add zero fill for VIDIOC_ENUM_FMT
  ...
parents b80e0d27 fd3a0195

Documentation/dvb/get_dvb_firmware

+82 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ use IO::Handle; 
		"tda10046lifeview", "av7110", "dec2000t", "dec2540t",

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

		"or51211", "or51132_qam", "or51132_vsb", "bluebird",

		"opera1");

		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2" );



# Check args

syntax() if (scalar(@ARGV) != 1);
@@ -37,8 +37,8 @@ for ($i=0; $i < scalar(@components); $i++) { 
	$outfile = eval($cid);

	die $@ if $@;

	print STDERR <<EOF;

Firmware $outfile extracted successfully.

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

Firmware(s) $outfile extracted successfully.

Now copy it(they) to either /usr/lib/hotplug/firmware or /lib/firmware

(depending on configuration of firmware hotplug).

EOF

	exit(0);
@@ -345,6 +345,85 @@ sub or51211 { 
    $fwfile;

}



sub cx231xx {

    my $fwfile = "v4l-cx231xx-avcore-01.fw";

    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";

    my $hash = "7d3bb956dc9df0eafded2b56ba57cc42";



    checkstandard();



    wgetfile($fwfile, $url);

    verify($fwfile, $hash);



    $fwfile;

}



sub cx18 {

    my $url = "http://linuxtv.org/downloads/firmware/";



    my %files = (

	'v4l-cx23418-apu.fw' => '588f081b562f5c653a3db1ad8f65939a',

	'v4l-cx23418-cpu.fw' => 'b6c7ed64bc44b1a6e0840adaeac39d79',

	'v4l-cx23418-dig.fw' => '95bc688d3e7599fd5800161e9971cc55',

    );



    checkstandard();



    my $allfiles;

    foreach my $fwfile (keys %files) {

	wgetfile($fwfile, "$url/$fwfile");

	verify($fwfile, $files{$fwfile});

	$allfiles .= " $fwfile";

    }



    $allfiles =~ s/^\s//;



    $allfiles;

}



sub cx23885 {

    my $url = "http://linuxtv.org/downloads/firmware/";



    my %files = (

	'v4l-cx23885-avcore-01.fw' => 'a9f8f5d901a7fb42f552e1ee6384f3bb',

	'v4l-cx23885-enc.fw'       => 'a9f8f5d901a7fb42f552e1ee6384f3bb',

    );



    checkstandard();



    my $allfiles;

    foreach my $fwfile (keys %files) {

	wgetfile($fwfile, "$url/$fwfile");

	verify($fwfile, $files{$fwfile});

	$allfiles .= " $fwfile";

    }



    $allfiles =~ s/^\s//;



    $allfiles;

}



sub pvrusb2 {

    my $url = "http://linuxtv.org/downloads/firmware/";



    my %files = (

	'v4l-cx25840.fw'           => 'dadb79e9904fc8af96e8111d9cb59320',

    );



    checkstandard();



    my $allfiles;

    foreach my $fwfile (keys %files) {

	wgetfile($fwfile, "$url/$fwfile");

	verify($fwfile, $files{$fwfile});

	$allfiles .= " $fwfile";

    }



    $allfiles =~ s/^\s//;



    $allfiles;

}



sub or51132_qam {

    my $fwfile = "dvb-fe-or51132-qam.fw";

    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";

Documentation/feature-removal-schedule.txt

+4 −4
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ Who: Pavel Machek <pavel@suse.cz> 


---------------------------



What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.

When:	December 2008

Files:	include/linux/video_decoder.h include/linux/videodev.h

Check:	include/linux/video_decoder.h include/linux/videodev.h

What:	Video4Linux API 1 ioctls and from Video devices.

When:	July 2009

Files:	include/linux/videodev.h

Check:	include/linux/videodev.h

Why:	V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6

	series. The old API have lots of drawbacks and don't provide enough

	means to work with all video and audio standards. The newer API is

Documentation/ioctl/ioctl-number.txt

+0 −2
Original line number Diff line number Diff line
@@ -122,10 +122,8 @@ Code Seq# Include File Comments 
'c'	00-7F	linux/coda.h		conflict!

'c'	80-9F	arch/s390/include/asm/chsc.h

'd'	00-FF	linux/char/drm/drm/h	conflict!

'd'	00-DF	linux/video_decoder.h	conflict!

'd'	F0-FF	linux/digi1.h

'e'	all	linux/digi1.h		conflict!

'e'	00-1F	linux/video_encoder.h	conflict!

'e'	00-1F	net/irda/irtty.h	conflict!

'f'	00-1F	linux/ext2_fs.h

'h'	00-7F				Charon filesystem

Documentation/video4linux/CARDLIST.bttv

+5 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ 
134 -> Adlink RTV24

135 -> DViCO FusionHDTV 5 Lite                             [18ac:d500]

136 -> Acorp Y878F                                         [9511:1540]

137 -> Conceptronic CTVFMi v2

137 -> Conceptronic CTVFMi v2                              [036e:109e]

138 -> Prolink Pixelview PV-BT878P+ (Rev.2E)

139 -> Prolink PixelView PlayTV MPEG2 PV-M4900

140 -> Osprey 440                                          [0070:ff07]
@@ -154,3 +154,7 @@ 
153 -> PHYTEC VD-012 (bt878)

154 -> PHYTEC VD-012-X1 (bt878)

155 -> PHYTEC VD-012-X2 (bt878)

156 -> IVCE-8784                                           [0000:f050,0001:f050,0002:f050,0003:f050]

157 -> Geovision GV-800(S) (master)                        [800a:763d]

158 -> Geovision GV-800(S) (slave)                         [800b:763d,800c:763d,800d:763d]

159 -> ProVideo PV183                                      [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]

Documentation/video4linux/CARDLIST.cx23885

+4 −0
Original line number Diff line number Diff line
@@ -12,3 +12,7 @@ 
 11 -> DViCO FusionHDTV DVB-T Dual Express                 [18ac:db78]

 12 -> Leadtek Winfast PxDVR3200 H                         [107d:6681]

 13 -> Compro VideoMate E650F                              [185b:e800]

 14 -> TurboSight TBS 6920                                 [6920:8888]

 15 -> TeVii S470                                          [d470:9022]

 16 -> DVBWorld DVB-S2 2005                                [0001:2005]

 17 -> NetUP Dual DVB-S2 CI                                [1b55:2a2c]