Resending signed-off version for kernel 3.2
Signed-off-by: Miroslav Slugen <thunder.mmm@xxxxxxxxx> From dadfa45664f765297e03e73a907ac04bd55e9b25 Mon Sep 17 00:00:00 2001 From: Miroslav Slugen <thunder.mmm@xxxxxxxxx> Date: Tue, 13 Dec 2011 19:36:15 +0100 Subject: [PATCH] Leadtek DTV2000H J has Philips FMD1216MEX tuner, this patch fixed not working radio part, but some stations are still not visible. --- diff -Naurp a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c --- a/drivers/media/video/cx88/cx88-cards.c 2012-01-05 00:55:44.000000000 +0100 +++ b/drivers/media/video/cx88/cx88-cards.c 2012-01-05 12:38:27.177910802 +0100 @@ -1306,7 +1306,7 @@ static const struct cx88_board cx88_boar }, [CX88_BOARD_WINFAST_DTV2000H_J] = { .name = "WinFast DTV2000 H rev. J", - .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .tuner_type = TUNER_PHILIPS_FMD1216MEX_MK3, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, @@ -3232,6 +3232,7 @@ static void cx88_card_setup_pre_i2c(stru cx_set(MO_GP0_IO, 0x00001010); break; + case CX88_BOARD_WINFAST_DTV2000H_J: case CX88_BOARD_HAUPPAUGE_HVR3000: case CX88_BOARD_HAUPPAUGE_HVR4000: /* Init GPIO */ diff -Naurp a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c --- a/drivers/media/video/cx88/cx88-dvb.c 2012-01-05 00:55:44.000000000 +0100 +++ b/drivers/media/video/cx88/cx88-dvb.c 2012-01-05 12:38:27.177910802 +0100 @@ -999,7 +999,6 @@ static int dvb_register(struct cx8802_de } break; case CX88_BOARD_WINFAST_DTV2000H: - case CX88_BOARD_WINFAST_DTV2000H_J: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR1100LP: case CX88_BOARD_HAUPPAUGE_HVR1300: @@ -1013,6 +1012,17 @@ static int dvb_register(struct cx8802_de goto frontend_detach; } break; + case CX88_BOARD_WINFAST_DTV2000H_J: + fe0->dvb.frontend = dvb_attach(cx22702_attach, + &hauppauge_hvr_config, + &core->i2c_adap); + if (fe0->dvb.frontend != NULL) { + if (!dvb_attach(simple_tuner_attach, fe0->dvb.frontend, + &core->i2c_adap, 0x61, + TUNER_PHILIPS_FMD1216MEX_MK3)) + goto frontend_detach; + } + break; case CX88_BOARD_HAUPPAUGE_HVR3000: /* MFE frontend 1 */ mfe_shared = 1; diff -Naurp a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c --- a/drivers/media/video/tuner-core.c 2012-01-05 00:55:44.000000000 +0100 +++ b/drivers/media/video/tuner-core.c 2012-01-05 12:38:27.177910802 +0100 @@ -326,6 +326,7 @@ static void set_type(struct i2c_client * t->mode_mask = T_RADIO; break; case TUNER_PHILIPS_FMD1216ME_MK3: + case TUNER_PHILIPS_FMD1216MEX_MK3: buffer[0] = 0x0b; buffer[1] = 0xdc; buffer[2] = 0x9c;