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

Commit af832623 authored by Igor M. Liplianin's avatar Igor M. Liplianin Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8989): Added support for TeVii S460 DVB-S/S2 card 



Added support for TeVii S460 DVB-S/S2 card. The card
based on cx24116 demodulator.

Signed-off-by: default avatarIgor M. Liplianin <liplianin@me.by>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 13c97bf5

drivers/media/video/cx88/cx88-cards.c

+23 −0
Original line number Diff line number Diff line
@@ -1709,6 +1709,18 @@ static const struct cx88_board cx88_boards[] = { 
		} },

		.mpeg           = CX88_MPEG_DVB,

	},

	[CX88_BOARD_TEVII_S460] = {

		.name           = "TeVii S460 DVB-S/S2",

		.tuner_type     = UNSET,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.input          = {{

			.type   = CX88_VMUX_DVB,

			.vmux   = 0,

		} },

		.mpeg           = CX88_MPEG_DVB,

	},

};



/* ------------------------------------------------------------------ */
@@ -2078,6 +2090,10 @@ static const struct cx88_subid cx88_subids[] = { 
		.subvendor = 0x0070,

		.subdevice = 0x6906,

		.card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,

	}, {

		.subvendor = 0xD460,

		.subdevice = 0x9022,

		.card      = CX88_BOARD_TEVII_S460,

	},

};
@@ -2649,7 +2665,14 @@ static void cx88_card_setup(struct cx88_core *core) 
		tea5767_cfg.priv  = &ctl;



		cx88_call_i2c_clients(core, TUNER_SET_CONFIG, &tea5767_cfg);

		break;

	}

	case  CX88_BOARD_TEVII_S460:

		cx_write(MO_SRST_IO, 0);

		msleep(100);

		cx_write(MO_SRST_IO, 1);

		msleep(100);

		break;

	} /*end switch() */

drivers/media/video/cx88/cx88-dvb.c

+40 −0
Original line number Diff line number Diff line
@@ -376,6 +376,31 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, 
	return 0;

}



static int tevii_dvbs_set_voltage(struct dvb_frontend *fe,

				      fe_sec_voltage_t voltage)

{

	struct cx8802_dev *dev= fe->dvb->priv;

	struct cx88_core *core = dev->core;



	switch (voltage) {

		case SEC_VOLTAGE_13:

			printk("LNB Voltage SEC_VOLTAGE_13\n");

			cx_write(MO_GP0_IO, 0x00006040);

			break;

		case SEC_VOLTAGE_18:

			printk("LNB Voltage SEC_VOLTAGE_18\n");

			cx_write(MO_GP0_IO, 0x00006060);

			break;

		case SEC_VOLTAGE_OFF:

			printk("LNB Voltage SEC_VOLTAGE_off\n");

			break;

	}



	if (core->prev_set_voltage)

		return core->prev_set_voltage(fe, voltage);

	return 0;

}



static int cx88_pci_nano_callback(void *ptr, int command, int arg)

{

	struct cx88_core *core = ptr;
@@ -548,6 +573,12 @@ static struct cx24116_config hauppauge_hvr4000_config = { 
	.reset_device           = cx24116_reset_device,

};



static struct cx24116_config tevii_s460_config = {

	.demod_address = 0x55,

	.set_ts_params = cx24116_set_ts_param,

	.reset_device  = cx24116_reset_device,

};



static int dvb_register(struct cx8802_dev *dev)

{

	struct cx88_core *core = dev->core;
@@ -918,6 +949,15 @@ static int dvb_register(struct cx8802_dev *dev) 
				0x08, 0x00, 0x00);

		}

		break;

	case CX88_BOARD_TEVII_S460:

	        dev->dvb.frontend = dvb_attach(cx24116_attach,

					       &tevii_s460_config,

					       &core->i2c_adap);

		if (dev->dvb.frontend != NULL) {

			core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;

			dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;

		}

		break;

	default:

		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",

		       core->name);

drivers/media/video/cx88/cx88.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ extern struct sram_channel cx88_sram_channels[]; 
#define CX88_BOARD_KWORLD_ATSC_120         67

#define CX88_BOARD_HAUPPAUGE_HVR4000       68

#define CX88_BOARD_HAUPPAUGE_HVR4000LITE   69

#define CX88_BOARD_TEVII_S460              70



enum cx88_itype {

	CX88_VMUX_COMPOSITE1 = 1,