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

Commit 1702b520 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: (42 commits)
  V4L/DVB (8108): Fix open/close race in saa7134
  V4L/DVB (8100): V4L/vivi: fix possible memory leak in vivi_fillbuff
  V4L/DVB (8097): xc5000: check device hardware state to determine if firmware download is needed
  V4L/DVB (8096): au8522: prevent false-positive lock status
  V4L/DVB (8092): videodev: simplify and fix standard enumeration
  V4L/DVB (8075): stv0299: Uncorrected block count and bit error rate fixed
  V4L/DVB (8074): av7110: OSD transfers should not be interrupted
  V4L/DVB (8073): av7110: Catch another type of ARM crash
  V4L/DVB (8071): tda10023: Fix possible kernel oops during initialisation
  V4L/DVB (8069): cx18: Fix S-Video and Compsite inputs for the Yuan MPC718 and enable card entry
  V4L/DVB (8068): cx18: Add I2C slave reset via GPIO upon initialization
  V4L/DVB (8067): cx18: Fix firmware load for case when digital capture happens first
  V4L/DVB (8066): cx18: Fix audio mux input definitions for HVR-1600 Line In 2 and FM radio
  V4L/DVB (8063): cx18: Fix unintended auto configurations in cx18-av-core
  V4L/DVB (8061): cx18: only select tuner / frontend modules if !DVB_FE_CUSTOMISE
  V4L/DVB (8048): saa7134: Fix entries for Avermedia A16d and Avermedia E506
  V4L/DVB (8044): au8522: tuning optimizations
  V4L/DVB (8043): au0828: add support for additional USB device id's
  V4L/DVB (8042): DVB-USB UMT-010 channel scan oops
  V4L/DVB (8040): soc-camera: remove soc_camera_host_class class
  ...
parents 0acbbee4 a1789873

Documentation/video4linux/CARDLIST.au0828

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

  1 -> Hauppauge HVR950Q                        (au0828)        [2040:7200]

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

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

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

drivers/media/common/ir-keymaps.c

+38 −0
Original line number Diff line number Diff line
@@ -2201,3 +2201,41 @@ IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE] = { 
	[0x25] = KEY_POWER,		/* power */

};

EXPORT_SYMBOL_GPL(ir_codes_powercolor_real_angel);



IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = {

	[0x20] = KEY_LIST,

	[0x00] = KEY_POWER,

	[0x28] = KEY_1,

	[0x18] = KEY_2,

	[0x38] = KEY_3,

	[0x24] = KEY_4,

	[0x14] = KEY_5,

	[0x34] = KEY_6,

	[0x2c] = KEY_7,

	[0x1c] = KEY_8,

	[0x3c] = KEY_9,

	[0x12] = KEY_SUBTITLE,

	[0x22] = KEY_0,

	[0x32] = KEY_REWIND,

	[0x3a] = KEY_SHUFFLE,

	[0x02] = KEY_PRINT,

	[0x11] = KEY_CHANNELDOWN,

	[0x31] = KEY_CHANNELUP,

	[0x0c] = KEY_ZOOM,

	[0x1e] = KEY_VOLUMEDOWN,

	[0x3e] = KEY_VOLUMEUP,

	[0x0a] = KEY_MUTE,

	[0x04] = KEY_AUDIO,

	[0x26] = KEY_RECORD,

	[0x06] = KEY_PLAY,

	[0x36] = KEY_STOP,

	[0x16] = KEY_PAUSE,

	[0x2e] = KEY_REWIND,

	[0x0e] = KEY_FASTFORWARD,

	[0x30] = KEY_TEXT,

	[0x21] = KEY_GREEN,

	[0x01] = KEY_BLUE,

	[0x08] = KEY_EPG,

	[0x2a] = KEY_MENU,

};

EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d);

drivers/media/common/tuners/tda18271-common.c

+9 −1
Original line number Diff line number Diff line
@@ -649,9 +649,17 @@ int tda18271_calc_rf_cal(struct dvb_frontend *fe, u32 *freq) 
	u8 val;



	int ret = tda18271_lookup_map(fe, RF_CAL, freq, &val);

	/* The TDA18271HD/C1 rf_cal map lookup is expected to go out of range

	 * for frequencies above 61.1 MHz.  In these cases, the internal RF

	 * tracking filters calibration mechanism is used.

	 *

	 * There is no need to warn the user about this.

	 */

	if (ret < 0)

		goto fail;



	regs[R_EB14] = val;



fail:

	return ret;

}

drivers/media/common/tuners/tda18271-fe.c

+34 −19
Original line number Diff line number Diff line
@@ -45,6 +45,21 @@ static inline int charge_pump_source(struct dvb_frontend *fe, int force) 
					   TDA18271_MAIN_PLL, force);

}



static inline void tda18271_set_if_notch(struct dvb_frontend *fe)

{

	struct tda18271_priv *priv = fe->tuner_priv;

	unsigned char *regs = priv->tda18271_regs;



	switch (priv->mode) {

	case TDA18271_ANALOG:

		regs[R_MPD]  &= ~0x80; /* IF notch = 0 */

		break;

	case TDA18271_DIGITAL:

		regs[R_MPD]  |= 0x80; /* IF notch = 1 */

		break;

	}

}



static int tda18271_channel_configuration(struct dvb_frontend *fe,

					  struct tda18271_std_map_item *map,

					  u32 freq, u32 bw)
@@ -60,25 +75,18 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, 
	regs[R_EP3]  &= ~0x1f; /* clear std bits */

	regs[R_EP3]  |= (map->agc_mode << 3) | map->std;



	if (priv->id == TDA18271HDC2) {

		/* set rfagc to high speed mode */

		regs[R_EP3] &= ~0x04;

	}



	/* set cal mode to normal */

	regs[R_EP4]  &= ~0x03;



	/* update IF output level & IF notch frequency */

	/* update IF output level */

	regs[R_EP4]  &= ~0x1c; /* clear if level bits */

	regs[R_EP4]  |= (map->if_lvl << 2);



	switch (priv->mode) {

	case TDA18271_ANALOG:

		regs[R_MPD]  &= ~0x80; /* IF notch = 0 */

		break;

	case TDA18271_DIGITAL:

		regs[R_MPD]  |= 0x80; /* IF notch = 1 */

		break;

	}



	/* update FM_RFn */

	regs[R_EP4]  &= ~0x80;

	regs[R_EP4]  |= map->fm_rfn << 7;
@@ -95,6 +103,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, 
	/* disable Power Level Indicator */

	regs[R_EP1]  |= 0x40;



	/* make sure thermometer is off */

	regs[R_TM]   &= ~0x10;



	/* frequency dependent parameters */



	tda18271_calc_ir_measure(fe, &freq);
@@ -135,6 +146,7 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, 
	switch (priv->role) {

	case TDA18271_MASTER:

		tda18271_calc_main_pll(fe, N);

		tda18271_set_if_notch(fe);

		tda18271_write_regs(fe, R_MPD, 4);

		break;

	case TDA18271_SLAVE:
@@ -142,6 +154,7 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, 
		tda18271_write_regs(fe, R_CPD, 4);



		regs[R_MPD] = regs[R_CPD] & 0x7f;

		tda18271_set_if_notch(fe);

		tda18271_write_regs(fe, R_MPD, 1);

		break;

	}
@@ -160,12 +173,14 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, 


	msleep(20);



	if (priv->id == TDA18271HDC2) {

		/* set rfagc to normal speed mode */

		if (map->fm_rfn)

			regs[R_EP3] &= ~0x04;

		else

			regs[R_EP3] |= 0x04;

		ret = tda18271_write_regs(fe, R_EP3, 1);

	}

fail:

	return ret;

}
@@ -507,7 +522,7 @@ static int tda18271_powerscan_init(struct dvb_frontend *fe) 
	/* set cal mode to normal */

	regs[R_EP4]  &= ~0x03;



	/* update IF output level & IF notch frequency */

	/* update IF output level */

	regs[R_EP4]  &= ~0x1c; /* clear if level bits */



	ret = tda18271_write_regs(fe, R_EP3, 2);

drivers/media/common/tuners/xc5000.c

+23 −7
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = { 
	{"FM Radio-INPUT1",   0x0208, 0x9002}

};



static int  xc5000_is_firmware_loaded(struct dvb_frontend *fe);

static int  xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len);

static int  xc5000_readregs(struct xc5000_priv *priv, u8 *buf, u8 len);

static void xc5000_TunerReset(struct dvb_frontend *fe);
@@ -352,7 +353,7 @@ static int xc_SetTVStandard(struct xc5000_priv *priv, 


static int xc_shutdown(struct xc5000_priv *priv)

{

	return 0;

	return XC_RESULT_SUCCESS;

	/* Fixme: cannot bring tuner back alive once shutdown

	 *        without reloading the driver modules.

	 *    return xc_write_reg(priv, XREG_POWER_DOWN, 0);
@@ -685,6 +686,25 @@ static int xc5000_set_params(struct dvb_frontend *fe, 
	return 0;

}



static int xc5000_is_firmware_loaded(struct dvb_frontend *fe)

{

	struct xc5000_priv *priv = fe->tuner_priv;

	int ret;

	u16 id;



	ret = xc5000_readreg(priv, XREG_PRODUCT_ID, &id);

	if (ret == XC_RESULT_SUCCESS) {

		if (id == XC_PRODUCT_ID_FW_NOT_LOADED)

			ret = XC_RESULT_RESET_FAILURE;

		else

			ret = XC_RESULT_SUCCESS;

	}



	dprintk(1, "%s() returns %s id = 0x%x\n", __func__,

		ret == XC_RESULT_SUCCESS ? "True" : "False", id);

	return ret;

}



static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe);



static int xc5000_set_analog_params(struct dvb_frontend *fe,
@@ -693,7 +713,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe, 
	struct xc5000_priv *priv = fe->tuner_priv;

	int ret;



	if(priv->fwloaded == 0)

	if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS)

		xc_load_fw_and_init_tuner(fe);



	dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n",
@@ -808,11 +828,10 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe) 
	struct xc5000_priv *priv = fe->tuner_priv;

	int ret = 0;



	if (priv->fwloaded == 0) {

	if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) {

		ret = xc5000_fwupload(fe);

		if (ret != XC_RESULT_SUCCESS)

			return ret;

		priv->fwloaded = 1;

	}



	/* Start the tuner self-calibration process */
@@ -852,7 +871,6 @@ static int xc5000_sleep(struct dvb_frontend *fe) 
		return -EREMOTEIO;

	}

	else {

		/* priv->fwloaded = 0; */

		return XC_RESULT_SUCCESS;

	}

}
@@ -933,7 +951,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, 
			cfg->i2c_address);

		printk(KERN_INFO

			"xc5000: Firmware has been loaded previously\n");

		priv->fwloaded = 1;

		break;

	case XC_PRODUCT_ID_FW_NOT_LOADED:

		printk(KERN_INFO
@@ -941,7 +958,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, 
			cfg->i2c_address);

		printk(KERN_INFO

			"xc5000: Firmware has not been loaded previously\n");

		priv->fwloaded = 0;

		break;

	default:

		printk(KERN_ERR