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

Commit a1ed02e9 authored by Andreas Oberritter's avatar Andreas Oberritter Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: Add Terratec Cinergy HTC Stick 



Signed-off-by: default avatarAndreas Oberritter <obi@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a6ff0a06

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

+15 −0
Original line number Diff line number Diff line
@@ -927,6 +927,19 @@ struct em28xx_board em28xx_boards[] = { 
				EM28XX_I2C_CLK_WAIT_ENABLE |

				EM28XX_I2C_FREQ_400_KHZ,

	},

	[EM2884_BOARD_CINERGY_HTC_STICK] = {

		.name         = "Terratec Cinergy HTC Stick",

		.has_dvb      = 1,

#if 0

		.tuner_type   = TUNER_PHILIPS_TDA8290,

		.tuner_addr   = 0x41,

		.dvb_gpio     = terratec_h5_digital, /* FIXME: probably wrong */

		.tuner_gpio   = terratec_h5_gpio,

#endif

		.i2c_speed    = EM2874_I2C_SECONDARY_BUS_SELECT |

				EM28XX_I2C_CLK_WAIT_ENABLE |

				EM28XX_I2C_FREQ_400_KHZ,

	},

	[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {

		.name         = "Hauppauge WinTV HVR 900",

		.tda9887_conf = TDA9887_PRESENT,
@@ -1960,6 +1973,8 @@ struct usb_device_id em28xx_id_table[] = { 
			.driver_info = EM2860_BOARD_TERRATEC_GRABBY },

	{ USB_DEVICE(0x0ccd, 0x10AF),

			.driver_info = EM2860_BOARD_TERRATEC_GRABBY },

	{ USB_DEVICE(0x0ccd, 0x00b2),

			.driver_info = EM2884_BOARD_CINERGY_HTC_STICK },

	{ USB_DEVICE(0x0fd9, 0x0033),

			.driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},

	{ USB_DEVICE(0x185b, 0x2870),

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

+1 −0
Original line number Diff line number Diff line
@@ -902,6 +902,7 @@ static int em28xx_dvb_init(struct em28xx *dev) 
		break;

	}

	case EM2884_BOARD_TERRATEC_H5:

	case EM2884_BOARD_CINERGY_HTC_STICK:

		terratec_h5_init(dev);



		dvb->dont_attach_fe1 = 1;

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
#define EM2884_BOARD_TERRATEC_H5		  79

#define EM28174_BOARD_PCTV_460E                   80

#define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C	  81

#define EM2884_BOARD_CINERGY_HTC_STICK		  82



/* Limits minimum and default number of buffers */

#define EM28XX_MIN_BUF 4