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

Commit 9f719637 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers
  V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference
  V4L/DVB: uvcvideo: Power line frequency control doesn't support GET_MIN/MAX/RES
  V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen
  V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner
  V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner
  V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner
  V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs
  V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig
  V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes
parents 293ffa8f 5d9955f8

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05 
tuner=82 - Philips CU1216L

tuner=83 - NXP TDA18271

tuner=84 - Sony BTF-Pxn01Z

tuner=85 - Philips FQ1236 MK5

drivers/media/common/tuners/tuner-simple.c

+1 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer) 
		buffer[3] = 0x39;

		break;

	case TUNER_PHILIPS_FQ1216LME_MK3:

	case TUNER_PHILIPS_FQ1236_MK5:

		tuner_err("This tuner doesn't have FM\n");

		/* Set the low band for sanity, since it covers 88-108 MHz */

		buffer[3] = 0x01;

drivers/media/common/tuners/tuner-types.c

+16 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,17 @@ static struct tuner_params tuner_sony_btf_pxn01z_params[] = { 
	},

};



/* ------------ TUNER_PHILIPS_FQ1236_MK5 - Philips NTSC ------------ */



static struct tuner_params tuner_philips_fq1236_mk5_params[] = {

	{

		.type   = TUNER_PARAM_TYPE_NTSC,

		.ranges = tuner_fm1236_mk3_ntsc_ranges,

		.count  = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges),

		.has_tda9887 = 1, /* TDA9885, no FM radio */

	},

};



/* --------------------------------------------------------------------- */



struct tunertype tuners[] = {
@@ -1826,6 +1837,11 @@ struct tunertype tuners[] = { 
		.params = tuner_sony_btf_pxn01z_params,

		.count  = ARRAY_SIZE(tuner_sony_btf_pxn01z_params),

	},

	[TUNER_PHILIPS_FQ1236_MK5] = { /* NTSC, TDA9885, no FM radio */

		.name   = "Philips FQ1236 MK5",

		.params = tuner_philips_fq1236_mk5_params,

		.count  = ARRAY_SIZE(tuner_philips_fq1236_mk5_params),

	},

};

EXPORT_SYMBOL(tuners);

drivers/media/video/ivtv/ivtv-streams.c

+3 −0
Original line number Diff line number Diff line
@@ -912,6 +912,9 @@ int ivtv_stop_v4l2_decode_stream(struct ivtv_stream *s, int flags, u64 pts) 
	clear_bit(IVTV_F_S_STREAMING, &s->s_flags);

	ivtv_flush_queues(s);



	/* decoder needs time to settle */

	ivtv_msleep_timeout(40, 0);



	/* decrement decoding */

	atomic_dec(&itv->decoding);

drivers/media/video/mem2mem_testdev.c

+3 −0
Original line number Diff line number Diff line
@@ -988,6 +988,9 @@ static int m2mtest_probe(struct platform_device *pdev) 
		goto err_m2m;

	}



	q_data[V4L2_M2M_SRC].fmt = &formats[0];

	q_data[V4L2_M2M_DST].fmt = &formats[0];



	return 0;



err_m2m: