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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (509 commits)
  V4L/DVB (7078): radio: fix sf16fmi section mismatch
  V4L/DVB (7077): bt878: remove handcrafted PCI subsystem ID check
  V4L/DVB (7075): Make a local function static
  V4L/DVB (7074): DiB7000P: correct tuning problem for 7MHz channel
  V4L/DVB (7073): DiB7070: Reception quality improved
  V4L/DVB (7072): sets the MT2060 IF1 frequency according to EEPROM
  V4L/DVB (7071): DiB0700: Start streaming the right way
  V4L/DVB (7070): Fix some tuning problems
  V4L/DVB (7069):  Support for myTV.t
  V4L/DVB (7068): Add support for WinTV Nova-T-CE driver
  V4L/DVB (7067): fix autoserach in the Hauppauge NOVA-T 500
  V4L/DVB (7066):  ASUS My Cinema U3000 Mini DVBT Tuner
  V4L/DVB (7065): Artec T14BR patches
  V4L/DVB (7063): xc5000: Fix OOPS caused by missing firmware
  V4L/DVB (7062): radio-si570x: Some fixes and new USB ID addition
  V4L/DVB (7061): radio-si470x: Some cleanups
  V4L/DVB (7060): em28xx: remove has_tuner
  V4L/DVB (7059): cx88: Ensure the tuner is reset correctly
  V4L/DVB (7058): IR corrections for the Pinnacle 800i
  V4L/DVB (7056): tuner: suppress obsolete tuner i2c address warning for XC5000 tuners
  ...
parents f31c3386 a999337b

Documentation/DocBook/videobook.tmpl

+0 −9
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static struct video_device my_radio 
{

        "My radio",

        VID_TYPE_TUNER,

        VID_HARDWARE_MYRADIO,

        radio_open.

        radio_close,

        NULL,                /* no read */
@@ -118,13 +117,6 @@ static struct video_device my_radio 
        indicates that the device can be tuned. Clearly our radio is going to have some

        way to change channel so it is tuneable.

  </para>

  <para>

        The VID_HARDWARE_ types are unique to each device. Numbers are assigned by

        <email>alan@redhat.com</email> when device drivers are going to be released. Until then you

        can pull a suitably large number out of your hat and use it. 10000 should be

        safe for a very long time even allowing for the huge number of vendors

        making new and different radio cards at the moment.

  </para>

  <para>

        We declare an open and close routine, but we do not need read or write,

        which are used to read and write video data to or from the card itself. As
@@ -844,7 +836,6 @@ static struct video_device my_camera 
        "My Camera",

        VID_TYPE_OVERLAY|VID_TYPE_SCALES|\

        VID_TYPE_CAPTURE|VID_TYPE_CHROMAKEY,

        VID_HARDWARE_MYCAMERA,

        camera_open.

        camera_close,

        camera_read,      /* no read */

Documentation/dvb/bt8xx.txt

+12 −0
Original line number Diff line number Diff line
@@ -78,6 +78,18 @@ Example: 
For a full list of card ID's please see Documentation/video4linux/CARDLIST.bttv.

In case of further problems please subscribe and send questions to the mailing list: linux-dvb@linuxtv.org.



2c) Probing the cards with broken PCI subsystem ID

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

There are some TwinHan cards that the EEPROM has become corrupted for some

reason. The cards do not have correct PCI subsystem ID. But we can force

probing the cards with broken PCI subsystem ID



	$ echo 109e 0878 $subvendor $subdevice > \

		/sys/bus/pci/drivers/bt878/new_id



109e: PCI_VENDOR_ID_BROOKTREE

0878: PCI_DEVICE_ID_BROOKTREE_878



Authors: Richard Walker,

	 Jamie Honan,

	 Michael Hunold,

Documentation/video4linux/CARDLIST.cx23885

+3 −1
Original line number Diff line number Diff line 
  0 -> UNKNOWN/GENERIC                                     [0070:3400]

  1 -> Hauppauge WinTV-HVR1800lp                           [0070:7600]

  2 -> Hauppauge WinTV-HVR1800                             [0070:7800,0070:7801]

  2 -> Hauppauge WinTV-HVR1800                             [0070:7800,0070:7801,0070:7809]

  3 -> Hauppauge WinTV-HVR1250                             [0070:7911]

  4 -> DViCO FusionHDTV5 Express                           [18ac:d500]

  5 -> Hauppauge WinTV-HVR1500Q                            [0070:7790,0070:7797]

  6 -> Hauppauge WinTV-HVR1500                             [0070:7710,0070:7717]

Documentation/video4linux/CARDLIST.cx88

+1 −0
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ 
 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM  [c180:c980]

 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   [0070:9600,0070:9601,0070:9602]

 57 -> ADS Tech Instant Video PCI                          [1421:0390]

 58 -> Pinnacle PCTV HD 800i                               [11bd:0051]

Documentation/video4linux/CARDLIST.em28xx

+10 −7
Original line number Diff line number Diff line 
  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]

  1 -> Unknown EM2820/2840 video grabber        (em2820/em2840)

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2750,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]

  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]

  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200]

  5 -> MSI VOX USB 2.0                          (em2820/em2840) [eb1a:2820]

  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]

  5 -> MSI VOX USB 2.0                          (em2820/em2840)

  6 -> Terratec Cinergy 200 USB                 (em2800)

  7 -> Leadtek Winfast USB II                   (em2800)

  8 -> Kworld USB2800                           (em2800)

  9 -> Pinnacle Dazzle DVC 90                   (em2820/em2840) [2304:0207]

 10 -> Hauppauge WinTV HVR 900                  (em2880)

 11 -> Terratec Hybrid XS                       (em2880)

  9 -> Pinnacle Dazzle DVC 90/DVC 100           (em2820/em2840) [2304:0207,2304:021a]

 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]

 11 -> Terratec Hybrid XS                       (em2880)        [0ccd:0042]

 12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)

 13 -> Terratec Prodigy XS                      (em2880)
 
 13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]

 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)

 15 -> V-Gear PocketTV                          (em2800)

 16 -> Hauppauge WinTV HVR 950                  (em2880)        [2040:6513]

CRA Git | Maintained and supported by SUSTech CRA and CCSE