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

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

V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card 



The card based on stv0299 or stv0288 demodulators.

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

Documentation/video4linux/CARDLIST.cx88

+2 −0
Original line number Diff line number Diff line
@@ -74,3 +74,5 @@ 
 73 -> TeVii S420 DVB-S                                    [d420:9022]

 74 -> Prolink Pixelview Global Extreme                    [1554:4976]

 75 -> PROF 7300 DVB-S/S2                                  [B033:3033]

 76 -> SATTRADE ST4200 DVB-S/S2                            [b200:4200]

 77 -> TBS 8910 DVB-S                                      [8910:8888]

drivers/media/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o 
obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o

obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o

obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o

obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o



obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o

obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o

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

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

		.mpeg           = CX88_MPEG_DVB,

	},

	[CX88_BOARD_TBS_8910] = {

		.name           = "TBS 8910 DVB-S",

		.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,

	},

	[CX88_BOARD_TBS_8920] = {

		.name           = "TBS 8920 DVB-S/S2",

		.tuner_type     = TUNER_ABSENT,
@@ -1871,6 +1883,18 @@ static const struct cx88_board cx88_boards[] = { 
		} },

		.mpeg           = CX88_MPEG_DVB,

	},

	[CX88_BOARD_SATTRADE_ST4200] = {

		.name           = "SATTRADE ST4200 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,

	},

};



/* ------------------------------------------------------------------ */
@@ -2260,6 +2284,10 @@ static const struct cx88_subid cx88_subids[] = { 
		.subvendor = 0xA044,

		.subdevice = 0x2011,

		.card      = CX88_BOARD_OMICOM_SS4_PCI,

	}, {

		.subvendor = 0x8910,

		.subdevice = 0x8888,

		.card      = CX88_BOARD_TBS_8910,

	}, {

		.subvendor = 0x8920,

		.subdevice = 0x8888,
@@ -2268,6 +2296,10 @@ static const struct cx88_subid cx88_subids[] = { 
		.subvendor = 0xB033,

		.subdevice = 0x3033,

		.card      = CX88_BOARD_PROF_7300,

	}, {

		.subvendor = 0xb200,

		.subdevice = 0x4200,

		.card      = CX88_BOARD_SATTRADE_ST4200,

	},

};
@@ -2878,8 +2910,10 @@ static void cx88_card_setup(struct cx88_core *core) 
	case  CX88_BOARD_TEVII_S420:

	case  CX88_BOARD_TEVII_S460:

	case  CX88_BOARD_OMICOM_SS4_PCI:

	case  CX88_BOARD_TBS_8910:

	case  CX88_BOARD_TBS_8920:

	case  CX88_BOARD_PROF_7300:

	case  CX88_BOARD_SATTRADE_ST4200:

		cx_write(MO_SRST_IO, 0);

		msleep(100);

		cx_write(MO_SRST_IO, 1);

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

+2 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,7 @@ static int dvb_register(struct cx8802_dev *dev) 
				0x08, ISL6421_DCL, 0x00);

		}

		break;

	case CX88_BOARD_TBS_8910:

	case CX88_BOARD_TEVII_S420:

		fe0->dvb.frontend = dvb_attach(stv0299_attach,

						&tevii_tuner_sharp_config,
@@ -1078,6 +1079,7 @@ static int dvb_register(struct cx8802_dev *dev) 
	case CX88_BOARD_OMICOM_SS4_PCI:

	case CX88_BOARD_TBS_8920:

	case CX88_BOARD_PROF_7300:

	case CX88_BOARD_SATTRADE_ST4200:

		fe0->dvb.frontend = dvb_attach(cx24116_attach,

					       &hauppauge_hvr4000_config,

					       &core->i2c_adap);

drivers/media/video/cx88/cx88.h

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ extern struct sram_channel cx88_sram_channels[]; 
#define CX88_BOARD_TEVII_S420              73

#define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74

#define CX88_BOARD_PROF_7300               75

#define CX88_BOARD_SATTRADE_ST4200         76

#define CX88_BOARD_TBS_8910                77



enum cx88_itype {

	CX88_VMUX_COMPOSITE1 = 1,