Skip to content

Commit

Permalink
V4L/DVB (6562): Make HVR900 to use also tveeprom
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 80b5220 commit 98ae127
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion drivers/media/video/em28xx/em28xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/tveeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down

0 comments on commit 98ae127

Please sign in to comment.