Commit 4717df58 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: (70 commits)
  V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
  V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners
  V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic
  V4L/DVB (7895): tveeprom: update Hauppauge analog audio and video decoders
  V4L/DVB (7893): xc5000: bug-fix: allow multiple devices in a single system
  V4L/DVB (7891): cx18/ivtv: fix open() kernel oops
  V4L/DVB (7890): cx18: removed bogus and confusing conditional
  V4L/DVB (7889): cx18: improve HVR-1600 detection.
  V4L/DVB (7888): cx18: minor card definition updates.
  V4L/DVB (7887): cx18: fix Compro H900 analog support.
  V4L/DVB (7881): saa7134: fixed a compile warning in saa7134-core.c
  V4L/DVB (7880): saa7134: remove explicit GPIO initialization
  V4L/DVB(7879): Adding cx18 Support for mxl5005s
  V4L/DVB(7878): mxl55005s: Makefile and Kconfig additions
  V4L/DVB(7877): mxl5005s: Ensure debug is off
  V4L/DVB(7876): mxl5005s: Remove incorrect copyright holders
  V4L/DVB(7875): mxl5005s: Remove redundant functions
  V4L/DVB(7874): mxl5005s: Fix function statics
  V4L/DVB(7873): mxl5005s: Fix header includes.
  V4L/DVB(7872): mxl5005s: checkpatch.pl compliance
  ...
parents fc99824c c2b7bbea

Documentation/video4linux/CARDLIST.cx23885

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 
  4 -> DViCO FusionHDTV5 Express                           [18ac:d500]

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

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

  7 -> Hauppauge WinTV-HVR1200                             [0070:71d1]

  7 -> Hauppauge WinTV-HVR1200                             [0070:71d1,0070:71d3]

  8 -> Hauppauge WinTV-HVR1700                             [0070:8101]

  9 -> Hauppauge WinTV-HVR1400                             [0070:8010]

Documentation/video4linux/CARDLIST.em28xx

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
 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]
 
 16 -> Hauppauge WinTV HVR 950                  (em2880)        [2040:6513,2040:6517,2040:651b,2040:651f]

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,15 @@ P: Jaya Kumar 
M:	jayakumar.alsa@gmail.com

S:	Maintained



CX18 VIDEO4LINUX DRIVER

P:	Hans Verkuil, Andy Walls

M:	hverkuil@xs4all.nl, awalls@radix.net

L:	ivtv-devel@ivtvdriver.org

L:	ivtv-users@ivtvdriver.org

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

S:	Maintained



CYBERPRO FB DRIVER

P:	Russell King

M:	rmk@arm.linux.org.uk

drivers/media/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ config DVB_CORE 


config VIDEO_MEDIA

	tristate

	default DVB_CORE || VIDEO_DEV

	depends on DVB_CORE || VIDEO_DEV

	default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV)



comment "Multimedia drivers"

drivers/media/common/tuners/Kconfig

+31 −19
Original line number Diff line number Diff line 
config MEDIA_ATTACH

	bool "Load and attach frontend and tuner driver modules as needed"

	depends on DVB_CORE

	depends on VIDEO_MEDIA

	depends on MODULES

	help

	  Remove the static dependency of DVB card drivers on all
@@ -19,10 +19,10 @@ config MEDIA_ATTACH 


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

	default VIDEO_MEDIA && I2C

	depends on VIDEO_MEDIA && I2C

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG

	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG

	select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE

	select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -46,7 +46,7 @@ if MEDIA_TUNER_CUSTOMIZE 


config MEDIA_TUNER_SIMPLE

	tristate "Simple tuner support"

	depends on I2C

	depends on VIDEO_MEDIA && I2C

	select MEDIA_TUNER_TDA9887

	default m if MEDIA_TUNER_CUSTOMIZE

	help
@@ -54,7 +54,7 @@ config MEDIA_TUNER_SIMPLE 


config MEDIA_TUNER_TDA8290

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

	depends on I2C

	depends on VIDEO_MEDIA && I2C

	select MEDIA_TUNER_TDA827X

	select MEDIA_TUNER_TDA18271

	default m if MEDIA_TUNER_CUSTOMIZE
@@ -63,21 +63,21 @@ config MEDIA_TUNER_TDA8290 


config MEDIA_TUNER_TDA827X

	tristate "Philips TDA827X silicon tuner"

	depends on DVB_CORE && I2C

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && I2C

	default m if MEDIA_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for Philips TDA9885/6/7
@@ -85,67 +85,79 @@ config MEDIA_TUNER_TDA9887 


config MEDIA_TUNER_TEA5761

	tristate "TEA 5761 radio tuner (EXPERIMENTAL)"

	depends on I2C && EXPERIMENTAL

	depends on VIDEO_MEDIA && I2C

	depends on 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && 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

	depends on VIDEO_MEDIA && I2C

	depends on HOTPLUG

	select 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

	depends on VIDEO_MEDIA && I2C

	depends on HOTPLUG

	select FW_LOADER

	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.



config MEDIA_TUNER_MXL5005S

	tristate "MaxLinear MSL5005S silicon tuner"

	depends on VIDEO_MEDIA && I2C

	default m if DVB_FE_CUSTOMISE

	help

	  A driver for the silicon tuner MXL5005S from MaxLinear.



endif # MEDIA_TUNER_CUSTOMIZE

CRA Git | Maintained and supported by SUSTech CRA and CCSE