From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 5 Nov 2007 12:30:39 +0000 (-0300)
Subject: V4L/DVB (6562): Make HVR900 to use also tveeprom
X-Git-Tag: v2.6.25-rc1~1235^2~395
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ae127cae56b99f2282d73399e0e1ca7dc13bc9;p=linux-2.6

V4L/DVB (6562): Make HVR900 to use also tveeprom

Hauppauge firmwares can be decoded using tveeprom. This patch adds HVR-900 as
a tveeprom client. It also adds xc3028 tuner entry to tveeprom.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index b1afc6c2d3..a2c0794821 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -587,11 +587,11 @@ void em28xx_card_setup(struct em28xx *dev)
 	/* request some modules */
 	switch (dev->model) {
 	case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
+	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
 	{
 		struct tveeprom tv;
 #ifdef CONFIG_MODULES
 		request_module("tveeprom");
-		request_module("ir-kbd-i2c");
 #endif
 		/* Call first TVeeprom */
 
@@ -603,6 +603,12 @@ void em28xx_card_setup(struct em28xx *dev)
 			dev->i2s_speed = 2048000;
 			dev->has_msp34xx = 1;
 		}
+#ifdef CONFIG_MODULES
+		if (tv.has_ir)
+			request_module("ir-kbd-i2c");
+#endif
+		/* FIXME: Should also retrieve decoder processor type */
+
 		break;
 	}
 	case EM2820_BOARD_KWORLD_PVRTV2800RF:
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 0faa149923..403fbd0afa 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -226,7 +226,7 @@ hauppauge_tuner[] =
 	{ TUNER_ABSENT,        "TCL M2523_3DI_E"},
 	{ TUNER_ABSENT,        "Samsung THPD5222FG30A"},
 	/* 120-129 */
-	{ TUNER_ABSENT,        "Xceive XC3028"},
+	{ TUNER_XC2028,        "Xceive XC3028"},
 	{ TUNER_ABSENT,        "Philips FQ1216LME MK5"},
 	{ TUNER_ABSENT,        "Philips FQD1216LME"},
 	{ TUNER_ABSENT,        "Conexant CX24118A"},