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

Commit b44c0267 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 (5751): Ivtv: fix ia64 printk format warnings.
  V4L/DVB (5761): Fix broken b2c2 dependency on non x86 architectures
  V4L/DVB (5673): Fix audio stuttering for saa711x/ivtv when in radio mode.
  V4L/DVB (5736): Add V4L2_FBUF_CAP/FLAG_LOCAL/GLOBAL_INV_ALPHA
  V4L/DVB (5732): Add ivtv CROPCAP support and fix ivtv S_CROP for video output.
  V4L/DVB (5730): Remove unused V4L2_CAP_VIDEO_OUTPUT_POS
  V4L/DVB (5720): Usbvision: fix urb allocation and submits
  V4L/DVB (5716): Tda10086,tda826x: fix tuning, STR/SNR values
  V4L/DVB (5675): Move big PIO accesses from the interrupt handler to a workhandler
  V4L/DVB (5699): Cinergyt2: fix file release handler
  V4L/DVB (5700): Saa7111: fix picture settings cache bug
  V4L/DVB (5702): Fix Kconfig items to avoid linkedition errors
parents bb3d2dd7 c4385098

drivers/media/common/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ config VIDEO_SAA7146 


config VIDEO_SAA7146_VV

	tristate

	depends on VIDEO_DEV

	select VIDEO_BUF

	select VIDEO_SAA7146

drivers/media/dvb/b2c2/Makefile

+5 −2
Original line number Diff line number Diff line 
b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \

	flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o \

	flexcop-dma.o

	flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o

obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o



ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)

b2c2-flexcop-objs += flexcop-dma.o

endif



b2c2-flexcop-pci-objs = flexcop-pci.o

obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o

drivers/media/dvb/cinergyT2/cinergyT2.c

+1 −2
Original line number Diff line number Diff line
@@ -519,8 +519,7 @@ static int cinergyt2_release (struct inode *inode, struct file *file) 
	struct dvb_device *dvbdev = file->private_data;

	struct cinergyt2 *cinergyt2 = dvbdev->priv;



	if (mutex_lock_interruptible(&cinergyt2->sem))

		return -ERESTARTSYS;

	mutex_lock(&cinergyt2->sem);



	if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) {

		cancel_delayed_work(&cinergyt2->query_work);

drivers/media/dvb/frontends/tda10086.c

+16 −5
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct tda10086_state { 
	/* private demod data */

	u32 frequency;

	u32 symbol_rate;

	bool has_lock;

};



static int debug = 0;
@@ -116,7 +117,7 @@ static int tda10086_init(struct dvb_frontend* fe) 
	// misc setup

	tda10086_write_byte(state, 0x01, 0x94);

	tda10086_write_byte(state, 0x02, 0x35); // NOTE: TT drivers appear to disable CSWP

	tda10086_write_byte(state, 0x03, 0x64);

	tda10086_write_byte(state, 0x03, 0xe4);

	tda10086_write_byte(state, 0x04, 0x43);

	tda10086_write_byte(state, 0x0c, 0x0c);

	tda10086_write_byte(state, 0x1b, 0xb0); // noise threshold
@@ -146,7 +147,7 @@ static int tda10086_init(struct dvb_frontend* fe) 
	// setup AGC

	tda10086_write_byte(state, 0x05, 0x0B);

	tda10086_write_byte(state, 0x37, 0x63);

	tda10086_write_byte(state, 0x3f, 0x03); // NOTE: flydvb uses 0x0a and varies it

	tda10086_write_byte(state, 0x3f, 0x0a); // NOTE: flydvb varies it

	tda10086_write_byte(state, 0x40, 0x64);

	tda10086_write_byte(state, 0x41, 0x4f);

	tda10086_write_byte(state, 0x42, 0x43);
@@ -398,6 +399,10 @@ static int tda10086_set_frontend(struct dvb_frontend* fe, 


	dprintk ("%s\n", __FUNCTION__);



	// modify parameters for tuning

	tda10086_write_byte(state, 0x02, 0x35);

	state->has_lock = false;



	// set params

	if (fe->ops.tuner_ops.set_params) {

		fe->ops.tuner_ops.set_params(fe, fe_params);
@@ -542,8 +547,14 @@ static int tda10086_read_status(struct dvb_frontend* fe, fe_status_t *fe_status) 
		*fe_status |= FE_HAS_VITERBI;

	if (val & 0x08)

		*fe_status |= FE_HAS_SYNC;

	if (val & 0x10)

	if (val & 0x10) {

		*fe_status |= FE_HAS_LOCK;

		if (!state->has_lock) {

			state->has_lock = true;

			// modify parameters for stable reception

			tda10086_write_byte(state, 0x02, 0x00);

		}

	}



	return 0;

}
@@ -555,7 +566,7 @@ static int tda10086_read_signal_strength(struct dvb_frontend* fe, u16 * signal) 


	dprintk ("%s\n", __FUNCTION__);



	_str = tda10086_read_byte(state, 0x43);

	_str = 0xff - tda10086_read_byte(state, 0x43);

	*signal = (_str << 8) | _str;



	return 0;
@@ -568,7 +579,7 @@ static int tda10086_read_snr(struct dvb_frontend* fe, u16 * snr) 


	dprintk ("%s\n", __FUNCTION__);



	_snr = tda10086_read_byte(state, 0x1c);

	_snr = 0xff - tda10086_read_byte(state, 0x1c);

	*snr = (_snr << 8) | _snr;



	return 0;

drivers/media/dvb/frontends/tda826x.c

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_param 
	buf[2] = (1<<5) | 0x0b; // 1Mhz + 0.45 VCO

	buf[3] = div >> 7;

	buf[4] = div << 1;

	buf[5] = 0xff; // basedband filter to max

	buf[6] = 0xfe; // gains at max + no RF attenuation

	buf[5] = 0x77; // baseband cut-off 19 MHz

	buf[6] = 0xfe; // baseband gain 9 db + no RF attenuation

	buf[7] = 0x83; // charge pumps at high, tests off

	buf[8] = 0x80; // recommended value 4 for AMPVCO + disable ports.

	buf[9] = 0x1a; // normal caltime + recommended values for SELTH + SELVTL