Commit b2ab26ab 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: (48 commits)
  V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070
  V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
  V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7
  V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map
  V4L/DVB (7978): cx18: explicitly test for XC2028 tuner
  V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
  V4L/DVB (7975): saa7134_empress
  V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error
  V4L/DVB (7972): or51132.c: unaligned
  V4L/DVB (7971): usb: unaligned
  V4L/DVB (7970): mix trivial endianness annotations
  V4L/DVB (7969): m920x: unaligned access
  V4L/DVB (7968): zoran: endianness annotations
  V4L/DVB (7967): bt8xx: unaligned access
  V4L/DVB (7966): cx18: direct dereferencing of iomem
  V4L/DVB (7965): annotate bcx_riscmem
  V4L/DVB (7964): cx18 iomem annotations
  V4L/DVB (7963): ivtv: trivial annotations
  V4L/DVB (7962): ttusb endianness annotations and fixes
  V4L/DVB (7961): fix endianness bug in dib0700_devices.c
  ...
parents 5965087d be573e78

Documentation/video4linux/CARDLIST.cx88

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
 59 -> DViCO FusionHDTV 5 PCI nano                         [18ac:d530]

 60 -> Pinnacle Hybrid PCTV                                [12ab:1788]

 61 -> Winfast TV2000 XP Global                            [107d:6f18]

 62 -> PowerColor Real Angel 330                           [14f1:ea3d]

 62 -> PowerColor RA330                                    [14f1:ea3d]

 63 -> Geniatech X8000-MT DVBT                             [14f1:8852]

 64 -> DViCO FusionHDTV DVB-T PRO                          [18ac:db30]

 65 -> DViCO FusionHDTV 7 Gold                             [18ac:d610]

Documentation/video4linux/cx18.txt

+3 −1
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.

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

   card and the Compro VideoMate H900 (note that this card only

   supports analog input, it has no digital tuner!).



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

drivers/media/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -2,12 +2,7 @@ 
# Makefile for the kernel multimedia device drivers.

#



obj-y := common/



obj-$(CONFIG_VIDEO_MEDIA) += common/



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

obj-$(CONFIG_VIDEO_MEDIA) += video/

obj-y += common/ video/



obj-$(CONFIG_VIDEO_DEV) += radio/

obj-$(CONFIG_DVB_CORE)  += dvb/

drivers/media/common/tuners/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config MEDIA_TUNER 
	tristate

	default VIDEO_MEDIA && I2C

	depends on VIDEO_MEDIA && I2C

	select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG

	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

drivers/media/common/tuners/mxl5005s.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ enum { 
	MXL_QAM,

	MXL_ANALOG_CABLE,

	MXL_ANALOG_OTA

} tuner_modu_type;

};



/* MXL5005 Tuner Register Struct */

struct TunerReg {
@@ -194,7 +194,7 @@ enum { 
	RFSYN_DIVM,                /* 88 */

	DN_BYPASS_AGC_I2C          /* 89 */

#endif

} MXL5005_ControlName;

};



/*

 * The following context is source code provided by MaxLinear.

CRA Git | Maintained and supported by SUSTech CRA and CCSE