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

[media] cx88: Fix radio support for Leadtek DTV2000H J

Leadtek DTV2000H J has Philips a FMD1216MEX tuner,
and not a FMD1216ME.

Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Miroslav Slugen and committed by
Mauro Carvalho Chehab
27b93d8a 98ab8550

+14 -2
+2 -1
drivers/media/video/cx88/cx88-cards.c
··· 1306 1306 }, 1307 1307 [CX88_BOARD_WINFAST_DTV2000H_J] = { 1308 1308 .name = "WinFast DTV2000 H rev. J", 1309 - .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, 1309 + .tuner_type = TUNER_PHILIPS_FMD1216MEX_MK3, 1310 1310 .radio_type = UNSET, 1311 1311 .tuner_addr = ADDR_UNSET, 1312 1312 .radio_addr = ADDR_UNSET, ··· 3232 3232 cx_set(MO_GP0_IO, 0x00001010); 3233 3233 break; 3234 3234 3235 + case CX88_BOARD_WINFAST_DTV2000H_J: 3235 3236 case CX88_BOARD_HAUPPAUGE_HVR3000: 3236 3237 case CX88_BOARD_HAUPPAUGE_HVR4000: 3237 3238 /* Init GPIO */
+11 -1
drivers/media/video/cx88/cx88-dvb.c
··· 1000 1000 } 1001 1001 break; 1002 1002 case CX88_BOARD_WINFAST_DTV2000H: 1003 - case CX88_BOARD_WINFAST_DTV2000H_J: 1004 1003 case CX88_BOARD_HAUPPAUGE_HVR1100: 1005 1004 case CX88_BOARD_HAUPPAUGE_HVR1100LP: 1006 1005 case CX88_BOARD_HAUPPAUGE_HVR1300: ··· 1010 1011 if (!dvb_attach(simple_tuner_attach, fe0->dvb.frontend, 1011 1012 &core->i2c_adap, 0x61, 1012 1013 TUNER_PHILIPS_FMD1216ME_MK3)) 1014 + goto frontend_detach; 1015 + } 1016 + break; 1017 + case CX88_BOARD_WINFAST_DTV2000H_J: 1018 + fe0->dvb.frontend = dvb_attach(cx22702_attach, 1019 + &hauppauge_hvr_config, 1020 + &core->i2c_adap); 1021 + if (fe0->dvb.frontend != NULL) { 1022 + if (!dvb_attach(simple_tuner_attach, fe0->dvb.frontend, 1023 + &core->i2c_adap, 0x61, 1024 + TUNER_PHILIPS_FMD1216MEX_MK3)) 1013 1025 goto frontend_detach; 1014 1026 } 1015 1027 break;
+1
drivers/media/video/tuner-core.c
··· 326 326 t->mode_mask = T_RADIO; 327 327 break; 328 328 case TUNER_PHILIPS_FMD1216ME_MK3: 329 + case TUNER_PHILIPS_FMD1216MEX_MK3: 329 330 buffer[0] = 0x0b; 330 331 buffer[1] = 0xdc; 331 332 buffer[2] = 0x9c;