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

Commit 2d5e3e8d 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: (28 commits)
  V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
  V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
  V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
  V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
  V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
  V4L/DVB (7782): pvrusb2: Driver is no longer experimental
  V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
  V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
  V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
  Rename common tuner Kconfig names to use the same
  Fix V4L/DVB core help messages
  V4L/DVB (7769): Move other terrestrial tuners to common/tuners
  V4L/DVB (7768): reorganize some DVB-S Kconfig items
  V4L/DVB(7767): Move tuners to common/tuners
  V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
  V4L/DVB (7765): Add support for Beholder BeholdTV H6
  V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
  V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
  V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
  V4L/DVB (7759): ivtv: increase version number to 1.2.1
  ...
parents b57ab763 aed6abd6

Documentation/video4linux/CARDLIST.saa7134

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
127 -> Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM [0000:5071,0000:507B,5ace:5070,5ace:5090]

128 -> Beholder BeholdTV Columbus TVFM          [0000:5201]

129 -> Beholder BeholdTV 607 / BeholdTV 609     [5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093]

130 -> Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193]

130 -> Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193,5ace:6191]

131 -> Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]

132 -> Genius TVGO AM11MCE

133 -> NXP Snake DVB-S reference design
@@ -140,3 +140,4 @@ 
139 -> Compro VideoMate T750                    [185b:c900]

140 -> Avermedia DVB-S Pro A700                 [1461:a7a1]

141 -> Avermedia DVB-S Hybrid+FM A700           [1461:a7a2]

142 -> Beholder BeholdTV H6                     [5ace:6290]

Documentation/video4linux/cx18.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Some notes regarding the cx18 driver for the Conexant CX23418 MPEG

encoder chip:



1) The only hardware currently supported is the Hauppauge HVR-1600.



2) Some people have problems getting the i2c bus to work. Cause unknown.

   The symptom is that the eeprom cannot be read and the card is

   unusable.



3) The audio from the analog tuner is mono only. Probably caused by

   incorrect audio register information in the datasheet. We are

   waiting for updated information from Conexant.



4) VBI (raw or sliced) has not yet been implemented.



5) MPEG indexing is not yet implemented.



6) The driver is still a bit rough around the edges, this should

   improve over time.





Firmware:



The firmware needs to be extracted from the Windows Hauppauge HVR-1600

driver, available here:



http://hauppauge.lightpath.net/software/install_cd/hauppauge_cd_3.4d1.zip



Unzip, then copy the following files to the firmware directory

and rename them as follows:



Drivers/Driver18/hcw18apu.rom -> v4l-cx23418-apu.fw

Drivers/Driver18/hcw18enc.rom -> v4l-cx23418-cpu.fw

Drivers/Driver18/hcw18mlC.rom -> v4l-cx23418-dig.fw

drivers/media/Kconfig

+50 −122
Original line number Diff line number Diff line
@@ -5,16 +5,20 @@ 
menu "Multimedia devices"

	depends on HAS_IOMEM



comment "Multimedia core support"



#

# V4L core and enabled API's

#



config VIDEO_DEV

	tristate "Video For Linux"

	---help---

	  Support for audio/video capture and overlay devices and FM radio

	  cards. The exact capabilities of each device vary.

	  V4L core support for video capture and overlay devices, webcams and

	  AM/FM radio cards.



	  This kernel includes support for the new Video for Linux Two API,

	  (V4L2) as well as the original system. Drivers and applications

	  need to be rewritten to use V4L2, but drivers for popular cards

	  and applications for most video capture functions already exist.

	  (V4L2).



	  Additional info and docs are available on the web at

	  <http://linuxtv.org>
@@ -36,8 +40,11 @@ config VIDEO_ALLOW_V4L1 
	default VIDEO_DEV && VIDEO_V4L2_COMMON

	select VIDEO_V4L1_COMPAT

	---help---

	  Enables a compatibility API used by most V4L2 devices to allow

	  its usage with legacy applications that supports only V4L1 api.

	  Enables drivers based on the legacy V4L1 API.



	  This api were developed to be used at Kernel 2.2 and 2.4, but

	  lacks support for several video standards. There are several

	  drivers at kernel that still depends on it.



	  If you are unsure as to whether this is required, answer Y.
@@ -46,9 +53,8 @@ config VIDEO_V4L1_COMPAT 
	depends on VIDEO_DEV

	default VIDEO_DEV

	---help---

	  This api were developed to be used at Kernel 2.2 and 2.4, but

	  lacks support for several video standards. There are several

	  drivers at kernel that still depends on it.

	  Enables a compatibility API used by most V4L2 devices to allow

	  its usage with legacy applications that supports only V4L1 api.



	  Documentation for the original API is included in the file

	  <Documentation/video4linux/API.html>.
@@ -58,135 +64,57 @@ config VIDEO_V4L1_COMPAT 


	  If you are unsure as to whether this is required, answer Y.



config VIDEO_V4L2

	tristate

	depends on VIDEO_DEV && VIDEO_V4L2_COMMON

	default VIDEO_DEV && VIDEO_V4L2_COMMON



config VIDEO_V4L1

	tristate

	depends on VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1

	default VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1



source "drivers/media/video/Kconfig"



source "drivers/media/radio/Kconfig"



source "drivers/media/dvb/Kconfig"



source "drivers/media/common/Kconfig"

#

# DVB Core

#



config VIDEO_TUNER

	tristate

	depends on I2C

	select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TEA5761 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TEA5767 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_SIMPLE if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TDA9887 if !VIDEO_TUNER_CUSTOMIZE



menuconfig VIDEO_TUNER_CUSTOMIZE

	bool "Customize analog tuner modules to build"

	depends on VIDEO_TUNER

config DVB_CORE

	tristate "DVB for Linux"

	depends on NET && INET

	select CRC32

	help

	  This allows the user to deselect tuner drivers unnecessary

	  for their hardware from the build. Use this option with care

	  as deselecting tuner drivers which are in fact necessary will

	  result in V4L devices which cannot be tuned due to lack of

	  driver support

	  DVB core utility functions for device handling, software fallbacks etc.



	  If unsure say N.



if VIDEO_TUNER_CUSTOMIZE



config TUNER_XC2028

	tristate "XCeive xc2028/xc3028 tuners"

	depends on I2C && FW_LOADER

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the xc2028/xc3028 tuners.

	  Enable this if you own a DVB/ATSC adapter and want to use it or if

	  you compile Linux for a digital SetTopBox.



config TUNER_MT20XX

	tristate "Microtune 2032 / 2050 tuners"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the MT2032 / MT2050 tuner.



config TUNER_TDA8290

	tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"

	depends on I2C

	select DVB_TDA827X

	select DVB_TDA18271

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for Philips TDA8290+8275(a) tuner.

	  Say Y when you have a DVB or an ATSC card and want to use it.



config TUNER_TEA5761

	tristate "TEA 5761 radio tuner (EXPERIMENTAL)"

	depends on I2C && EXPERIMENTAL

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the Philips TEA5761 radio tuner.

	  API specs and user tools are available from <http://www.linuxtv.org/>.



config TUNER_TEA5767

	tristate "TEA 5767 radio tuner"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the Philips TEA5767 radio tuner.

	  Please report problems regarding this support to the LinuxDVB

	  mailing list.



config TUNER_SIMPLE

	tristate "Simple tuner support"

	depends on I2C

	select TUNER_TDA9887

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for various simple tuners.

	  If unsure say N.



config TUNER_TDA9887

	tristate "TDA 9885/6/7 analog IF demodulator"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for Philips TDA9885/6/7

	  analog IF demodulator.

config VIDEO_MEDIA

	tristate

	default DVB_CORE || VIDEO_DEV

	depends on DVB_CORE || VIDEO_DEV



endif # VIDEO_TUNER_CUSTOMIZE

comment "Multimedia drivers"



config VIDEOBUF_GEN

	tristate

source "drivers/media/common/Kconfig"



config VIDEOBUF_DMA_SG

	depends on HAS_DMA

	select VIDEOBUF_GEN

	tristate

#

# Tuner drivers for DVB and V4L

#



config VIDEOBUF_VMALLOC

	select VIDEOBUF_GEN

	tristate

source "drivers/media/common/tuners/Kconfig"



config VIDEOBUF_DVB

	tristate

	select VIDEOBUF_GEN

	select VIDEOBUF_DMA_SG

#

# Video/Radio/Hybrid adapters

#



config VIDEO_BTCX

	tristate

source "drivers/media/video/Kconfig"



config VIDEO_IR_I2C

	tristate

source "drivers/media/radio/Kconfig"



config VIDEO_IR

	tristate

	depends on INPUT

	select VIDEO_IR_I2C if I2C

#

# DVB adapters

#



config VIDEO_TVEEPROM

	tristate

	depends on I2C

source "drivers/media/dvb/Kconfig"



config DAB

	boolean "DAB adapters"

drivers/media/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
# Makefile for the kernel multimedia device drivers.

#



obj-y := common/

obj-y += video/

obj-$(CONFIG_VIDEO_MEDIA) += common/



# Since hybrid devices are here, should be compiled if DVB and/or V4L

obj-$(CONFIG_VIDEO_MEDIA) += video/



obj-$(CONFIG_VIDEO_DEV) += radio/

obj-$(CONFIG_DVB_CORE)  += dvb/
 
ifeq ($(CONFIG_DVB_CORE),)

  obj-$(CONFIG_VIDEO_TUNER)  += dvb/frontends/

endif

drivers/media/common/tuners/Kconfig

0 → 100644
+146 −0
Original line number Diff line number Diff line 
config MEDIA_ATTACH

	bool "Load and attach frontend driver modules as needed"

	depends on DVB_CORE

	depends on MODULES

	help

	  Remove the static dependency of DVB card drivers on all

	  frontend modules for all possible card variants. Instead,

	  allow the card drivers to only load the frontend modules

	  they require. This saves several KBytes of memory.



	  Note: You will need module-init-tools v3.2 or later for this feature.



	  If unsure say Y.



config MEDIA_TUNER

	tristate

	default DVB_CORE || VIDEO_DEV

	depends on DVB_CORE || VIDEO_DEV

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TEA5767 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMIZE



menuconfig MEDIA_TUNER_CUSTOMIZE

	bool "Customize analog and hybrid tuner modules to build"

	depends on MEDIA_TUNER

	help

	  This allows the user to deselect tuner drivers unnecessary

	  for their hardware from the build. Use this option with care

	  as deselecting tuner drivers which are in fact necessary will

	  result in V4L/DVB devices which cannot be tuned due to lack of

	  driver support



	  If unsure say N.



if MEDIA_TUNER_CUSTOMIZE



config MEDIA_TUNER_SIMPLE

	tristate "Simple tuner support"

	depends on I2C

	select MEDIA_TUNER_TDA9887

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for various simple tuners.



config MEDIA_TUNER_TDA8290

	tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"

	depends on I2C

	select MEDIA_TUNER_TDA827X

	select MEDIA_TUNER_TDA18271

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for Philips TDA8290+8275(a) tuner.



config MEDIA_TUNER_TDA827X

	tristate "Philips TDA827X silicon tuner"

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A DVB-T silicon tuner module. Say Y when you want to support this tuner.



config MEDIA_TUNER_TDA18271

	tristate "NXP TDA18271 silicon tuner"

	depends on I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A silicon tuner module. Say Y when you want to support this tuner.



config MEDIA_TUNER_TDA9887

	tristate "TDA 9885/6/7 analog IF demodulator"

	depends on I2C

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for Philips TDA9885/6/7

	  analog IF demodulator.



config MEDIA_TUNER_TEA5761

	tristate "TEA 5761 radio tuner (EXPERIMENTAL)"

	depends on I2C && EXPERIMENTAL

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the Philips TEA5761 radio tuner.



config MEDIA_TUNER_TEA5767

	tristate "TEA 5767 radio tuner"

	depends on I2C

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the Philips TEA5767 radio tuner.



config MEDIA_TUNER_MT20XX

	tristate "Microtune 2032 / 2050 tuners"

	depends on I2C

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the MT2032 / MT2050 tuner.



config MEDIA_TUNER_MT2060

	tristate "Microtune MT2060 silicon IF tuner"

	depends on I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon IF tuner MT2060 from Microtune.



config MEDIA_TUNER_MT2266

	tristate "Microtune MT2266 silicon tuner"

	depends on I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon baseband tuner MT2266 from Microtune.



config MEDIA_TUNER_MT2131

	tristate "Microtune MT2131 silicon tuner"

	depends on I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon baseband tuner MT2131 from Microtune.



config MEDIA_TUNER_QT1010

	tristate "Quantek QT1010 silicon tuner"

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon tuner QT1010 from Quantek.



config MEDIA_TUNER_XC2028

	tristate "XCeive xc2028/xc3028 tuners"

	depends on I2C && FW_LOADER

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the xc2028/xc3028 tuners.



config MEDIA_TUNER_XC5000

	tristate "Xceive XC5000 silicon tuner"

	depends on I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon tuner XC5000 from Xceive.

	  This device is only used inside a SiP called togther with a

	  demodulator for now.



endif # MEDIA_TUNER_CUSTOMIZE