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

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



This merges the DVB tree, but fixes up the history that had gotten
screwed up by a broken commit.

The history is fixed up by re-doing the commit properly (taking the
resolve from the final result of the original), and then cherry-picking
the commits that followed the broken merge.

* dvb: (190 commits)
  V4L/DVB (3545): Fixed no_overlay option and quirks on saa7134 driver
  V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion
  V4L/DVB (3538): Bt8xx documentation update
  V4L/DVB (3537a): Whitespace cleanup
  V4L/DVB (3533): Add WSS (wide screen signalling) module parameters
  V4L/DVB (3532): Moved duplicated code of ALPS BSRU6 tuner to a standalone file.
  V4L/DVB (3530): Kconfig: remove VIDEO_AUDIO_DECODER
  V4L/DVB (3529): Kconfig: add menu items for cs53l32a and wm8775 A/D converters
  V4L/DVB (3528): Kconfig: fix ATSC frontend menu item names by manufacturer
  V4L/DVB (3527): VIDEO_CPIA2 must depend on USB
  V4L/DVB (3525): Kconfig: remove VIDEO_DECODER
  V4L/DVB (3524): Kconfig: add menu items for saa7115 and saa7127
  V4L/DVB (3494): Kconfig: select VIDEO_MSP3400 to build msp3400.ko
  V4L/DVB (3522): Fixed a trouble with other PAL standards
  V4L/DVB (3521): Avoid warnings at video-buf.c
  V4L/DVB (3514): SAA7113 doesn't have auto std chroma detection mode
  V4L/DVB (3513): Remove saa711x driver
  V4L/DVB (3509): Make a needlessly global function static.
  V4L/DVB (3506): Cinergy T2 dmx cleanup on disconnect
  V4L/DVB (3504): Medion 7134: Autodetect second bridge chip
  ...

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parents c4a1745a ecb73774

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -30,3 +30,5 @@ include/linux/autoconf.h 
include/linux/compile.h

include/linux/version.h



# stgit generated dirs

patches-*

Documentation/dvb/avermedia.txt

+3 −7
Original line number Diff line number Diff line 


HOWTO: Get An Avermedia DVB-T working under Linux

	   ______________________________________________
@@ -137,11 +136,8 @@ Getting the card going 
   To  power  up  the  card,  load  the  following modules in the

   following order:



     * insmod dvb-core.o

     * modprobe bttv.o

     * insmod bt878.o

     * insmod dvb-bt8xx.o

     * insmod sp887x.o

     * modprobe bttv (normally loaded automatically)

     * modprobe dvb-bt8xx (or place dvb-bt8xx in /etc/modules)



   Insertion  of  these  modules  into  the  running  kernel will

   activate the appropriate DVB device nodes. It is then possible
@@ -302,4 +298,4 @@ Further Update 
   Many  thanks to Nigel Pearson for the updates to this document

   since the recent revision of the driver.



   January 29th 2004
 
   February 14th 2006

Documentation/dvb/bt8xx.txt

+50 −90
Original line number Diff line number Diff line 
How to get the Nebula, PCTV, FusionHDTV Lite and Twinhan DST cards working

==========================================================================

How to get the bt8xx cards working

==================================



This class of cards has a bt878a as the PCI interface, and

require the bttv driver.

1) General information

======================



Please pay close attention to the warning about the bttv module

options below for the DST card.

This class of cards has a bt878a as the PCI interface, and require the bttv driver

for accessing the i2c bus and the gpio pins of the bt8xx chipset.

Please see Documentation/dvb/cards.txt => o Cards based on the Conexant Bt8xx PCI bridge:



1) General informations

=======================



These drivers require the bttv driver to provide the means to access

the i2c bus and the gpio pins of the bt8xx chipset.



Because of this, you need to enable

"Device drivers" => "Multimedia devices"

  => "Video For Linux" => "BT848 Video For Linux"



Furthermore you need to enable

"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices"

  => "DVB for Linux" "DVB Core Support" "BT8xx based PCI cards"

Compiling kernel please enable:

a.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "BT848 Video For Linux"

b.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices"

 => "DVB for Linux" "DVB Core Support" "Bt8xx based PCI Cards"



2) Loading Modules

==================



In general you need to load the bttv driver, which will handle the gpio and

i2c communication for us, plus the common dvb-bt8xx device driver.

The frontends for Nebula (nxt6000), Pinnacle PCTV (cx24110), TwinHan (dst),

FusionHDTV DVB-T Lite (mt352) and FusionHDTV5 Lite (lgdt330x) are loaded

automatically by the dvb-bt8xx device driver.

In default cases bttv is loaded automatically.

To load the backend either place dvb-bt8xx in etc/modules, or apply manually:



3a) Nebula / Pinnacle PCTV / FusionHDTV Lite

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



   $ modprobe bttv (normally bttv is being loaded automatically by kmod)

	$ modprobe dvb-bt8xx



(or just place dvb-bt8xx in /etc/modules for automatic loading)

All frontends will be loaded automatically.

People running udev please see Documentation/dvb/udev.txt.



In the following cases overriding the PCI type detection for dvb-bt8xx might be necessary:



3b) TwinHan and Clones

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

2a) Running TwinHan and Clones

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



   $ modprobe bttv card=0x71

	$ modprobe bttv card=113

	$ modprobe dvb-bt8xx

	$ modprobe dst



The value 0x71 will override the PCI type detection for dvb-bt8xx,

which  is necessary for TwinHan cards. Omission of this parameter might result

in a system lockup.



If you're having an older card (blue color PCB) and card=0x71 locks up

your machine, try using 0x68, too. If that does not work, ask on the

mailing list.



The DST module takes a couple of useful parameters.



verbose takes values 0 to 4. These values control the verbosity level,

and can be used to debug also.



verbose=0 means complete disabling of messages

	1 only error messages are displayed

	2 notifications are also displayed

	3 informational messages are also displayed

	4 debug setting

Useful parameters for verbosity level and debugging the dst module:



dst_addons takes values 0 and 0x20. A value of 0 means it is a FTA card.

0x20 means it has a Conditional Access slot.

verbose=0:		messages are disabled

	1:		only error messages are displayed

	2:		notifications are displayed

	3:		other useful messages are displayed

	4:		debug setting

dst_addons=0:		card is a free to air (FTA) card only

	   0x20:	card has a conditional access slot for scrambled channels



The autodetected values are determined by the cards 'response string'

which you can see in your logs e.g.

The autodetected values are determined by the cards' "response string".

In your logs see f. ex.: dst_get_device_id: Recognize [DSTMCI].

For bug reports please send in a complete log with verbose=4 activated.

Please also see Documentation/dvb/ci.txt.



dst_get_device_id: Recognise [DSTMCI]



If you need to sent in bug reports on the dst, please do send in a complete

log with the verbose=4 module parameter. For general usage, the default setting

of verbose=1 is ideal.





4) Multiple cards

2b) Running multiple cards

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



If you happen to be running multiple cards, it would be advisable to load

the bttv module with the card id. This would help to solve any module loading

problems that you might face.



For example, if you have a Twinhan and Clones card along with a FusionHDTV5 Lite



	$ modprobe bttv card=0x71 card=0x87

Examples of card ID's:



Here the order of the card id is important and should be the same as that of the

physical order of the cards. Here card=0x71 represents the Twinhan and clones

and card=0x87 represents Fusion HDTV5 Lite. These arguments can also be

specified in decimal, rather than hex:

Pinnacle PCTV Sat:		 94

Nebula Electronics Digi TV:	104

pcHDTV HD-2000 TV:		112

Twinhan DST and clones:		113

Avermedia AverTV DVB-T 771:	123

Avermedia AverTV DVB-T 761:	124

DViCO FusionHDTV DVB-T Lite:	128

DViCO FusionHDTV 5 Lite:	135



Notice: The order of the card ID should be uprising:

Example:

	$ modprobe bttv card=113 card=135

	$ modprobe dvb-bt8xx



Some examples of card-id's



Pinnacle Sat		0x5e  (94)

Nebula Digi TV		0x68  (104)

PC HDTV			0x70  (112)

Twinhan			0x71  (113)

FusionHDTV DVB-T Lite	0x80  (128)

FusionHDTV5 Lite	0x87  (135)



For a full list of card-id's, see the V4L Documentation within the kernel

source:  linux/Documentation/video4linux/CARDLIST.bttv



If you have problems with this please do ask on the mailing list.

For a full list of card ID's please see Documentation/video4linux/CARDLIST.bttv.

In case of further problems send questions to the mailing list: www.linuxdvb.org.



--

Authors: Richard Walker,

	 Jamie Honan,

	 Michael Hunold,

	 Manu Abraham,

	 Uwe Bugla,

	 Michael Krufky

Documentation/dvb/get_dvb_firmware

+21 −2
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
use File::Temp qw/ tempdir /;

use IO::Handle;



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

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

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

		"tda10046lifeview", "av7110", "dec2000t", "dec2540t",

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

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



# Check args
@@ -126,6 +127,24 @@ sub tda10046 { 
    $outfile;

}



sub tda10046lifeview {

    my $sourcefile = "Drv_2.11.02.zip";

    my $url = "http://www.lifeview.com.tw/drivers/pci_card/FlyDVB-T/$sourcefile";

    my $hash = "1ea24dee4eea8fe971686981f34fd2e0";

    my $outfile = "dvb-fe-tda10046.fw";

    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);



    checkstandard();



    wgetfile($sourcefile, $url);

    unzip($sourcefile, $tmpdir);

    extract("$tmpdir/LVHybrid.sys", 0x8b088, 24602, "$tmpdir/fwtmp");

    verify("$tmpdir/fwtmp", $hash);

    copy("$tmpdir/fwtmp", $outfile);



    $outfile;

}



sub av7110 {

    my $sourcefile = "dvb-ttpci-01.fw-261d";

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

Documentation/dvb/readme.txt

+21 −11
Original line number Diff line number Diff line
@@ -20,11 +20,23 @@ http://linuxtv.org/downloads/ 


What's inside this directory:



"avermedia.txt"

contains detailed information about the

Avermedia DVB-T cards. See also "bt8xx.txt".



"bt8xx.txt"

contains detailed information about the

various bt8xx based "budget" DVB cards.



"cards.txt"

contains a list of supported hardware.



"ci.txt"

contains detailed information about the

CI module as part from TwinHan cards and Clones.



"contributors.txt"

is the who-is-who of DVB development

is the who-is-who of DVB development.



"faq.txt"

contains frequently asked questions and their answers.
@@ -34,19 +46,17 @@ script to download and extract firmware for those devices 
that require it.



"ttusb-dec.txt"

contains detailed informations about the

contains detailed information about the

TT DEC2000/DEC3000 USB DVB hardware.



"bt8xx.txt"

contains detailed installation instructions for the

various bt8xx based "budget" DVB cards

(Nebula, Pinnacle PCTV, Twinhan DST)



"README.dibusb"

contains detailed information about adapters

based on DiBcom reference design.



"udev.txt"

how to get DVB and udev up and running.



"README.dvb-usb"

contains detailed information about the DVB USB cards.



"README.flexcop"

contains detailed information about the

Technisat- and Flexcop B2C2 drivers.



Good luck and have fun!

CRA Git | Maintained and supported by SUSTech CRA and CCSE