[PATCH] V4L: Fixed eeprom handling for cx88 and added Nova-T PCI model 90003

- Fixed code handling for eeprom on cx88 boards.

- Hauppauge released a new version of the Nova-T-PCI (9002) a few months ago
with a different (compatible) tuner (but lacking RF passthru). The official
model# is 90003. All features are working.

- Adding entry to the known model list after testing.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Steven Toth and committed by
Linus Torvalds
0fe22865 bbf7871e

+12 -9
+4 -2
drivers/media/video/cx88/cx88-cards.c
··· 1088 1088 switch (tv.model) 1089 1089 { 1090 1090 case 90002: /* Nova-T-PCI (9002) */ 1091 + case 92001: /* Nova-S-Plus (Video and IR) */ 1092 + case 92002: /* Nova-S-Plus (Video and IR) */ 1093 + case 90003: /* Nova-T-PCI (9002 No RF out) */ 1091 1094 case 90500: /* Nova-T-PCI (oem) */ 1092 1095 case 90501: /* Nova-T-PCI (oem/IR) */ 1093 1096 case 92000: /* Nova-SE2 (OEM, No Video or IR) */ 1094 - case 92001: /* Nova-S-Plus (Video and IR) */ 1095 - case 92002: /* Nova-S-Plus (Video and IR) */ 1097 + 1096 1098 /* known */ 1097 1099 break; 1098 1100 default:
+8 -7
drivers/media/video/tveeprom.c
··· 382 382 memset(tvee, 0, sizeof(*tvee)); 383 383 done = len = beenhere = 0; 384 384 385 - /* Hack for processing eeprom for em28xx */ 385 + /* Hack for processing eeprom for em28xx and cx 2388x*/ 386 386 if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) && 387 - (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95)) 388 - start=0xa0; 389 - else if ((eeprom_data[0] == 0x1f) && (eeprom_data[8] == 0x84)) 390 - start=8; 391 - else if ((eeprom_data[0] == 0x17) && (eeprom_data[8] == 0x84)) 392 - start=8; 387 + (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95)) 388 + start=0xa0; /* Generic em28xx offset */ 389 + else if (((eeprom_data[0] & 0xf0) == 0x10) && 390 + (eeprom_data[1] == 0x00) && 391 + (eeprom_data[2] == 0x00) && 392 + (eeprom_data[8] == 0x84)) 393 + start=8; /* Generic cx2388x offset */ 393 394 else 394 395 start=0; 395 396