tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] tveeprom: Update list of chips and extend serial number to 32bits

The update was supplied directly by PCTV.

Add tuner ids 182-188.
Add audproc ids 45-52.
Add decoder chip ids 43-53.
Use 32bits for the serial number.

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Matthias Schwarzott and committed by
Mauro Carvalho Chehab c4e7b893 336fea92

+29 -7
+29 -7
drivers/media/common/tveeprom.c
··· 286 286 { TUNER_ABSENT, "Xceive XC5200C"}, 287 287 { TUNER_ABSENT, "NXP 18273"}, 288 288 { TUNER_ABSENT, "Montage M88TS2022"}, 289 - /* 180-189 */ 289 + /* 180-188 */ 290 290 { TUNER_ABSENT, "NXP 18272M"}, 291 291 { TUNER_ABSENT, "NXP 18272S"}, 292 + 293 + { TUNER_ABSENT, "Mirics MSi003"}, 294 + { TUNER_ABSENT, "MaxLinear MxL256"}, 295 + { TUNER_ABSENT, "SiLabs Si2158"}, 296 + { TUNER_ABSENT, "SiLabs Si2178"}, 297 + { TUNER_ABSENT, "SiLabs Si2157"}, 298 + { TUNER_ABSENT, "SiLabs Si2177"}, 299 + { TUNER_ABSENT, "ITE IT9137FN"}, 292 300 }; 293 301 294 302 /* Use TVEEPROM_AUDPROC_INTERNAL for those audio 'chips' that are ··· 359 351 { TVEEPROM_AUDPROC_INTERNAL, "CX23887" }, 360 352 { TVEEPROM_AUDPROC_INTERNAL, "SAA7164" }, 361 353 { TVEEPROM_AUDPROC_INTERNAL, "AU8522" }, 354 + /* 45-49 */ 355 + { TVEEPROM_AUDPROC_INTERNAL, "AVF4910B" }, 356 + { TVEEPROM_AUDPROC_INTERNAL, "SAA7231" }, 357 + { TVEEPROM_AUDPROC_INTERNAL, "CX23102" }, 358 + { TVEEPROM_AUDPROC_INTERNAL, "SAA7163" }, 359 + { TVEEPROM_AUDPROC_OTHER, "AK4113" }, 360 + /* 50-52 */ 361 + { TVEEPROM_AUDPROC_OTHER, "CS5340" }, 362 + { TVEEPROM_AUDPROC_OTHER, "CS8416" }, 363 + { TVEEPROM_AUDPROC_OTHER, "CX20810" }, 362 364 }; 363 365 364 366 /* This list is supplied by Hauppauge. Thanks! */ ··· 389 371 "CX25843", "CX23418", "NEC61153", "CX23885", "CX23888", 390 372 /* 35-39 */ 391 373 "SAA7131", "CX25837", "CX23887", "CX23885A", "CX23887A", 392 - /* 40-42 */ 393 - "SAA7164", "CX23885B", "AU8522" 374 + /* 40-44 */ 375 + "SAA7164", "CX23885B", "AU8522", "ADV7401", "AVF4910B", 376 + /* 45-49 */ 377 + "SAA7231", "CX23102", "SAA7163", "ADV7441A", "ADV7181C", 378 + /* 50-53 */ 379 + "CX25836", "TDA9955", "TDA19977", "ADV7842" 394 380 }; 395 381 396 382 static int hasRadioTuner(int tunerType) ··· 570 548 tvee->serial_number = 571 549 eeprom_data[i+5] + 572 550 (eeprom_data[i+6] << 8) + 573 - (eeprom_data[i+7] << 16); 551 + (eeprom_data[i+7] << 16)+ 552 + (eeprom_data[i+8] << 24); 574 553 575 - if ((eeprom_data[i + 8] & 0xf0) && 576 - (tvee->serial_number < 0xffffff)) { 554 + if (eeprom_data[i + 8] == 0xf0) { 577 555 tvee->MAC_address[0] = 0x00; 578 556 tvee->MAC_address[1] = 0x0D; 579 557 tvee->MAC_address[2] = 0xFE; ··· 718 696 } 719 697 } 720 698 721 - tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n", 699 + tveeprom_info("Hauppauge model %d, rev %s, serial# %u\n", 722 700 tvee->model, tvee->rev_str, tvee->serial_number); 723 701 if (tvee->has_MAC_address == 1) 724 702 tveeprom_info("MAC address is %pM\n", tvee->MAC_address);