[media] cx88: Fix radio support for Leadtek DTV2000H J (27b93d8a) · Commits · 戴 / test

drivers/media/video/cx88/cx88-cards.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1306,7 +1306,7 @@ static const struct cx88_board cx88_boards[] = {
		},
		[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(struct cx88_core *core)
		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 */

+11 −1

Original line number	Diff line number	Diff line
		@@ -1000,7 +1000,6 @@ static int dvb_register(struct cx8802_dev *dev)
		}
		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:
		@@ -1014,6 +1013,17 @@ static int dvb_register(struct cx8802_dev *dev)
		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;

+1 −0

Original line number	Diff line number	Diff line
		@@ -326,6 +326,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
		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;