public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* Re: [PATCH] em28xx: Add Terratec Cinergy HTC Stick
@ 2011-11-28 15:41 Jens Erdmann
  2011-11-28 16:02 ` Antti Palosaari
  2011-11-28 16:57 ` Andreas Oberritter
  0 siblings, 2 replies; 9+ messages in thread
From: Jens Erdmann @ 2011-11-28 15:41 UTC (permalink / raw)
  To: linux-media

Hi folks,

just a few quetstions:
1. Why is the device named EM2884_BOARD_CINERGY_HTC_STICK and not
    EM2884_BOARD_TERRATEC_HTC_STICK like all the other devices from that
    vendor? Looks inconsistent to me.

2. I stumbled over http://linux.terratec.de/tv_en.html where they list a NXP TDA18271
    as used tuner for H5 and HTC Stick devices. I dont have any experience in this
    kind of stuff but i am just asking.

Regads,
  Jens
___________________________________________________________
SMS schreiben mit WEB.DE FreeMail - einfach, schnell und
kostenguenstig. Jetzt gleich testen! http://f.web.de/?mc=021192

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] em28xx: Add Terratec Cinergy HTC Stick
@ 2011-11-16 15:06 Andreas Oberritter
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Oberritter @ 2011-11-16 15:06 UTC (permalink / raw)
  To: Mauro Carvalho Chehab; +Cc: linux-media, TerraTux

- Can receive DVB-C and DVB-T. No analogue television or radio yet.
- For now it's a copy of the Terratec H5 code with a different name.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
---
 linux/drivers/media/video/em28xx/em28xx-cards.c |   15 +++++++++++++++
 linux/drivers/media/video/em28xx/em28xx-dvb.c   |    1 +
 linux/drivers/media/video/em28xx/em28xx.h       |    1 +
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index 9b747c2..03322d0 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -892,6 +892,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,
@@ -1925,6 +1938,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),
diff --git a/linux/drivers/media/video/em28xx/em28xx-dvb.c b/linux/drivers/media/video/em28xx/em28xx-dvb.c
index cef7a2d..270cb98 100644
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c
@@ -789,6 +789,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;
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index 2a2cb7e..5d763f7 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -121,6 +121,7 @@
 #define EM28174_BOARD_PCTV_290E                   78
 #define EM2884_BOARD_TERRATEC_H5		  79
 #define EM28174_BOARD_PCTV_460E                   80
+#define EM2884_BOARD_CINERGY_HTC_STICK		  81
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-11-30 21:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-28 15:41 [PATCH] em28xx: Add Terratec Cinergy HTC Stick Jens Erdmann
2011-11-28 16:02 ` Antti Palosaari
2011-11-28 16:57 ` Andreas Oberritter
2011-11-29 12:04   ` Jens Erdmann
2011-11-29 12:56     ` Andreas Oberritter
2011-11-30 19:39       ` Jens Erdmann
2011-11-30 20:41         ` Andreas Oberritter
2011-11-30 21:22           ` Mauro Carvalho Chehab
  -- strict thread matches above, loose matches on Subject: below --
2011-11-16 15:06 Andreas Oberritter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox