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

Commit 5564da7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (95 commits)
  V4L/DVB (9296): Patch to remove warning message during cx88-dvb compilation
  V4L/DVB (9294): gspca: Add a stop sequence in t613.
  V4L/DVB (9293): gspca: Separate and fix the sensor dependant sequences in t613.
  V4L/DVB (9292): gspca: Call the control setting functions at init time in t613.
  V4L/DVB (9291): gspca: Do not set the white balance temperature by default in t613.
  V4L/DVB (9290): gspca: Adjust the sensor init sequences in t613.
  V4L/DVB (9289): gspca: Other sensor identified as om6802 in t613.
  V4L/DVB (9288): gspca: Write to the USB device and not USB interface in t613.
  V4L/DVB (9287): gspca: Change the name of the multi bytes write function in t613.
  V4L/DVB (9286): gspca: Compilation problem of gspca.c and the kernel version.
  V4L/DVB (9283): Correct typo and enable setting the gain on the mt9m111 sensor
  V4L/DVB (9282): Properly iterate the urbs when destroying them.
  V4L/DVB (9281): gspca: Add hflip and vflip to the po1030 sensor
  V4L/DVB (9280): gspca: Use the gspca debug macros
  V4L/DVB (9279): gspca: Correct some copyright headers
  V4L/DVB (9278): gspca: Remove the m5602_debug variable
  V4L/DVB (9277): gspca: propagate an error in m5602_start_transfer()
  V4L/DVB (9276): videobuf-dvb: two functions are now static
  V4L/DVB (9275): dvb: input data pointer of cx24116_writeregN() should be const
  V4L/DVB (9274): Remove spurious messages and turn into debug.
  ...
parents 58617d5e d4305c68

Documentation/video4linux/CARDLIST.au0828

+1 −1
Original line number Diff line number Diff line 
  0 -> Unknown board                            (au0828)

  1 -> Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008]

  1 -> Hauppauge HVR950Q                        (au0828)        [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008]

  2 -> Hauppauge HVR850                         (au0828)        [2040:7240]

  3 -> DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]

  4 -> Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -75,3 +75,4 @@ tuner=73 - Samsung TCPG 6121P30A 
tuner=75 - Philips TEA5761 FM Radio

tuner=76 - Xceive 5000 tuner

tuner=77 - TCL tuner MF02GIP-5N-E

tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner

drivers/media/common/tuners/mxl5005s.c

+7 −3
Original line number Diff line number Diff line
@@ -3481,7 +3481,9 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum, 
					}

					ctrlVal = 0;

					for (k = 0; k < state->MXL_Ctrl[i].size; k++)

						ctrlVal += state->MXL_Ctrl[i].val[k] * (1 << k);

						ctrlVal += state->

							MXL_Ctrl[i].val[k] *

							(1 << k);

				} else

					return -1;

			}
@@ -3581,7 +3583,7 @@ static void MXL_RegWriteBit(struct dvb_frontend *fe, u8 address, u8 bit, 


static u32 MXL_Ceiling(u32 value, u32 resolution)

{

	return (value/resolution + (value % resolution > 0 ? 1 : 0));

	return value / resolution + (value % resolution > 0 ? 1 : 0);

}



/* Retrieve the Initialzation Registers */
@@ -3910,7 +3912,10 @@ static int mxl5005s_writeregs(struct dvb_frontend *fe, u8 *addrtable, 


static int mxl5005s_init(struct dvb_frontend *fe)

{

	struct mxl5005s_state *state = fe->tuner_priv;



	dprintk(1, "%s()\n", __func__);

	state->current_mode = MXL_QAM;

	return mxl5005s_reconfigure(fe, MXL_QAM, MXL5005S_BANDWIDTH_6MHZ);

}
@@ -4092,7 +4097,6 @@ struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe, 
	state->frontend = fe;

	state->config = config;

	state->i2c = i2c;

	state->current_mode = MXL_QAM;



	printk(KERN_INFO "MXL5005S: Attached at address 0x%02x\n",

		config->i2c_address);

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

+2 −0
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer) 
	case TUNER_PHILIPS_FM1216ME_MK3:

	case TUNER_PHILIPS_FM1236_MK3:

	case TUNER_PHILIPS_FMD1216ME_MK3:

	case TUNER_PHILIPS_FMD1216MEX_MK3:

	case TUNER_LG_NTSC_TAPE:

	case TUNER_PHILIPS_FM1256_IH3:

	case TUNER_TCL_MF02GIP_5N:
@@ -767,6 +768,7 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf, 


	switch (priv->type) {

	case TUNER_PHILIPS_FMD1216ME_MK3:

	case TUNER_PHILIPS_FMD1216MEX_MK3:

		if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ &&

		    params->frequency >= 158870000)

			buf[3] |= 0x08;

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

+32 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ static struct tuner_params tuner_tena_9533_di_params[] = { 
	},

};



/* ------------ TUNER_PHILIPS_FMD1216ME_MK3 - Philips PAL ------------ */

/* ------------ TUNER_PHILIPS_FMD1216ME(X)_MK3 - Philips PAL ------------ */



static struct tuner_range tuner_philips_fmd1216me_mk3_pal_ranges[] = {

	{ 16 * 160.00 /*MHz*/, 0x86, 0x51, },
@@ -984,6 +984,27 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = { 
	},

};



static struct tuner_params tuner_philips_fmd1216mex_mk3_params[] = {

	{

		.type   = TUNER_PARAM_TYPE_PAL,

		.ranges = tuner_philips_fmd1216me_mk3_pal_ranges,

		.count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_pal_ranges),

		.has_tda9887 = 1,

		.port1_active = 1,

		.port2_active = 1,

		.port2_fm_high_sensitivity = 1,

		.port2_invert_for_secam_lc = 1,

		.port1_set_for_fm_mono = 1,

		.radio_if = 1,

		.fm_gain_normal = 1,

	},

	{

		.type   = TUNER_PARAM_TYPE_DIGITAL,

		.ranges = tuner_philips_fmd1216me_mk3_dvb_ranges,

		.count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_dvb_ranges),

		.iffreq = 16 * 36.125, /*MHz*/

	},

};



/* ------ TUNER_LG_TDVS_H06XF - LG INNOTEK / INFINEON ATSC ----- */
@@ -1663,6 +1684,16 @@ struct tunertype tuners[] = { 
		.params = tuner_tcl_mf02gip_5n_params,

		.count  = ARRAY_SIZE(tuner_tcl_mf02gip_5n_params),

	},

	[TUNER_PHILIPS_FMD1216MEX_MK3] = { /* Philips PAL */

		.name   = "Philips FMD1216MEX MK3 Hybrid Tuner",

		.params = tuner_philips_fmd1216mex_mk3_params,

		.count  = ARRAY_SIZE(tuner_philips_fmd1216mex_mk3_params),

		.min = 16 *  50.87,

		.max = 16 * 858.00,

		.stepsize = 166667,

		.initdata = tua603x_agc112,

		.sleepdata = (u8[]){ 4, 0x9c, 0x60, 0x85, 0x54 },

	},

};

EXPORT_SYMBOL(tuners);