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

Commit cec4e6c1 authored by Michel Garnier's avatar Michel Garnier Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: Add dvb support for Terratec Cinergy Hybrid T USB XS FR

parent 74c4792c
Loading
Loading
Loading
Loading
+17 −4
Original line number Original line Diff line number Diff line
@@ -187,6 +187,18 @@ static struct em28xx_reg_seq pinnacle_hybrid_pro_digital[] = {
	{	-1,		-1,	-1,		-1},
	{	-1,		-1,	-1,		-1},
};
};


static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_analog[] = {
	{EM28XX_R08_GPIO,	0x6d,	~EM_GPIO_4,	10},
	{EM2880_R04_GPO,	0x00,	0xff,		10},
	{ -1,			-1,	-1,		-1},
};

static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_digital[] = {
	{EM28XX_R08_GPIO,	0x6e,	~EM_GPIO_4,	10},
	{EM2880_R04_GPO,	0x08,	0xff,		10},
	{ -1,			-1,	-1,		-1},
};

/* eb1a:2868 Reddo DVB-C USB TV Box
/* eb1a:2868 Reddo DVB-C USB TV Box
   GPIO4 - CU1216L NIM
   GPIO4 - CU1216L NIM
   Other GPIOs seems to be don't care. */
   Other GPIOs seems to be don't care. */
@@ -781,22 +793,22 @@ struct em28xx_board em28xx_boards[] = {
		.tuner_gpio   = default_tuner_gpio,
		.tuner_gpio   = default_tuner_gpio,
		.decoder      = EM28XX_TVP5150,
		.decoder      = EM28XX_TVP5150,
		.has_dvb      = 1,
		.has_dvb      = 1,
		.dvb_gpio     = default_digital,
		.dvb_gpio     = terratec_cinergy_USB_XS_FR_digital,
		.input        = { {
		.input        = { {
			.type     = EM28XX_VMUX_TELEVISION,
			.type     = EM28XX_VMUX_TELEVISION,
			.vmux     = TVP5150_COMPOSITE0,
			.vmux     = TVP5150_COMPOSITE0,
			.amux     = EM28XX_AMUX_VIDEO,
			.amux     = EM28XX_AMUX_VIDEO,
			.gpio     = default_analog,
			.gpio     = terratec_cinergy_USB_XS_FR_analog,
		}, {
		}, {
			.type     = EM28XX_VMUX_COMPOSITE1,
			.type     = EM28XX_VMUX_COMPOSITE1,
			.vmux     = TVP5150_COMPOSITE1,
			.vmux     = TVP5150_COMPOSITE1,
			.amux     = EM28XX_AMUX_LINE_IN,
			.amux     = EM28XX_AMUX_LINE_IN,
			.gpio     = default_analog,
			.gpio     = terratec_cinergy_USB_XS_FR_analog,
		}, {
		}, {
			.type     = EM28XX_VMUX_SVIDEO,
			.type     = EM28XX_VMUX_SVIDEO,
			.vmux     = TVP5150_SVIDEO,
			.vmux     = TVP5150_SVIDEO,
			.amux     = EM28XX_AMUX_LINE_IN,
			.amux     = EM28XX_AMUX_LINE_IN,
			.gpio     = default_analog,
			.gpio     = terratec_cinergy_USB_XS_FR_analog,
		} },
		} },
	},
	},
	[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
	[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
@@ -2168,6 +2180,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
		ctl->demod = XC3028_FE_ZARLINK456;
		ctl->demod = XC3028_FE_ZARLINK456;
		break;
		break;
	case EM2880_BOARD_TERRATEC_HYBRID_XS:
	case EM2880_BOARD_TERRATEC_HYBRID_XS:
	case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
	case EM2881_BOARD_PINNACLE_HYBRID_PRO:
		ctl->demod = XC3028_FE_ZARLINK456;
		ctl->demod = XC3028_FE_ZARLINK456;
		break;
		break;