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

Commit 19859229 authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12101): em28xx: add support for EVGA inDtube 



Add support for the EVGA inDtube.  Both ATSC and analog side validated as
fully functional.

Thanks to Jake Crimmins from EVGA for providing the correct GPIO info.
Thanks to Alan Hagge for doing all the device testing.
Thanks to Greg Williamson for providing hardware for testing.

Cc: Jake Crimmins <jcrimmins@evga.com>
Cc: Alan Hagge <ahagge@gmail.com>
Cc: Greg Williamson <cheeseboy16@gmail.com>
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cdf7bfa8

Documentation/video4linux/CARDLIST.em28xx

+1 −0
Original line number Diff line number Diff line
@@ -65,3 +65,4 @@ 
 67 -> Terratec Grabby                          (em2860)        [0ccd:0096]

 68 -> Terratec AV350                           (em2860)        [0ccd:0084]

 69 -> KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]

 70 -> Evga inDtube                             (em2882)

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

+48 −0
Original line number Diff line number Diff line
@@ -139,6 +139,24 @@ static struct em28xx_reg_seq kworld_330u_digital[] = { 
	{ -1,			-1,	-1,		-1},

};



/* Evga inDtube

   GPIO0 - Enable digital power (s5h1409) - low to enable

   GPIO1 - Enable analog power (tvp5150/emp202) - low to enable

   GPIO4 - xc3028 reset

   GOP3  - s5h1409 reset

 */

static struct em28xx_reg_seq evga_indtube_analog[] = {

	{EM28XX_R08_GPIO,	0x79,   0xff,		60},

	{	-1,		-1,	-1,		-1},

};



static struct em28xx_reg_seq evga_indtube_digital[] = {

	{EM28XX_R08_GPIO,	0x7a,	0xff,		 1},

	{EM2880_R04_GPO,	0x04,	0xff,		10},

	{EM2880_R04_GPO,	0x0c,	0xff,		 1},

	{ -1,			-1,	-1,		-1},

};



/* Callback for the most boards */

static struct em28xx_reg_seq default_tuner_gpio[] = {

	{EM28XX_R08_GPIO,	EM_GPIO_4,	EM_GPIO_4,	10},
@@ -1449,6 +1467,31 @@ struct em28xx_board em28xx_boards[] = { 
			.gpio     = terratec_av350_unmute_gpio,

		} },

	},

	[EM2882_BOARD_EVGA_INDTUBE] = {

		.name         = "Evga inDtube",

		.tuner_type   = TUNER_XC2028,

		.tuner_gpio   = default_tuner_gpio,

		.decoder      = EM28XX_TVP5150,

		.mts_firmware = 1,

		.has_dvb      = 1,

		.dvb_gpio     = evga_indtube_digital,

		.input        = { {

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = TVP5150_COMPOSITE0,

			.amux     = EM28XX_AMUX_VIDEO,

			.gpio     = evga_indtube_analog,

		}, {

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = TVP5150_COMPOSITE1,

			.amux     = EM28XX_AMUX_LINE_IN,

			.gpio     = evga_indtube_analog,

		}, {

			.type     = EM28XX_VMUX_SVIDEO,

			.vmux     = TVP5150_SVIDEO,

			.amux     = EM28XX_AMUX_LINE_IN,

			.gpio     = evga_indtube_analog,

		} },

	},

};

const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1571,6 +1614,7 @@ static struct em28xx_hash_table em28xx_eeprom_hash[] = { 
	{0x72cc5a8b, EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2, TUNER_YMEC_TVF_5533MF},

	{0x966a0441, EM2880_BOARD_KWORLD_DVB_310U, TUNER_XC2028},

	{0x9567eb1a, EM2880_BOARD_EMPIRE_DUAL_TV, TUNER_XC2028},

	{0xcee44a99, EM2882_BOARD_EVGA_INDTUBE, TUNER_XC2028},

};



/* I2C devicelist hash table for devices with generic USB IDs */
@@ -1834,6 +1878,10 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl) 
		ctl->demod = XC3028_FE_CHINA;

		ctl->fname = XC2028_DEFAULT_FIRMWARE;

		break;

	case EM2882_BOARD_EVGA_INDTUBE:

		ctl->demod = XC3028_FE_CHINA;

		ctl->fname = XC3028L_DEFAULT_FIRMWARE;

		break;

	default:

		ctl->demod = XC3028_FE_OREN538;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ static int dvb_init(struct em28xx *dev) 
		}

		break;

	case EM2883_BOARD_KWORLD_HYBRID_330U:

	case EM2882_BOARD_EVGA_INDTUBE:

		dvb->frontend = dvb_attach(s5h1409_attach,

					   &em28xx_s5h1409_with_xc3028,

					   &dev->i2c_adap);

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#define EM2860_BOARD_TERRATEC_GRABBY		  67

#define EM2860_BOARD_TERRATEC_AV350		  68

#define EM2882_BOARD_KWORLD_ATSC_315U		  69

#define EM2882_BOARD_EVGA_INDTUBE		  70



/* Limits minimum and default number of buffers */

#define EM28XX_MIN_BUF 4