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

Commit 846cf85e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
  V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines
  V4L/DVB (4770): Fix mode switch of Compro Videomate T300
  V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T
  V4L/DVB (4786): Pvrusb2: use NULL instead of 0
  V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default
  V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060
parents 64651309 c5dec9fb

drivers/media/common/saa7146_i2c.c

+4 −6
Original line number Diff line number Diff line
@@ -217,11 +217,9 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d 
		}

		/* wait until we get a transfer done or error */

		timeout = jiffies + HZ/100 + 1; /* 10ms */

		while(1) {

			/**

			 *  first read usually delivers bogus results...

			 */

		/* first read usually delivers bogus results... */

		saa7146_i2c_status(dev);

		while(1) {

			status = saa7146_i2c_status(dev);

			if ((status & 0x3) != 1)

				break;
@@ -232,7 +230,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d 
				DEB_I2C(("saa7146_i2c_writeout: timed out waiting for end of xfer\n"));

				return -EIO;

			}

			if ((++trial < 20) && short_delay)

			if (++trial < 50 && short_delay)

				udelay(10);

			else

				msleep(1);

drivers/media/dvb/dvb-usb/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config DVB_USB_A800 
	tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
@@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB 
	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"

	depends on DVB_USB

	select DVB_DIB3000MB

	select DVB_TUNER_MT2060

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help

	  Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by

	  DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
@@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC 
	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help

	  Support for USB2.0 DVB-T receivers based on reference designs made by

	  DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
@@ -70,7 +70,7 @@ config DVB_USB_DIB0700 
	tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help

	  Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The

	  USB bridge is also present in devices having the DiB7700 DVB-T-USB
@@ -87,7 +87,7 @@ config DVB_USB_UMT_010 
	tristate "HanfTek UMT-010 DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
@@ -153,7 +153,7 @@ config DVB_USB_NOVA_T_USB2 
	tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE

	help

	  Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.

drivers/media/dvb/frontends/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ config DVB_TDA826X 


config DVB_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.

drivers/media/dvb/frontends/bcm3510.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct bcm3510_config 
	int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);

};



#if defined(CONFIG_DVB_BCM3510) || defined(CONFIG_DVB_BCM3510_MODULE)

#if defined(CONFIG_DVB_BCM3510) || (defined(CONFIG_DVB_BCM3510_MODULE) && defined(MODULE))

extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,

					   struct i2c_adapter* i2c);

#else

drivers/media/dvb/frontends/cx22700.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct cx22700_config 
	u8 demod_address;

};



#if defined(CONFIG_DVB_CX22700) || defined(CONFIG_DVB_CX22700_MODULE)

#if defined(CONFIG_DVB_CX22700) || (defined(CONFIG_DVB_CX22700_MODULE) && defined(MODULE))

extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,

					   struct i2c_adapter* i2c);

#else