Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91ae3299 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3411): FE6600 is a Thomson tuner 



- The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson
- renamed tuner and dvb_pll structs accordingly

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 69b27e3d

Documentation/video4linux/CARDLIST.tuner

+1 −1
Original line number Diff line number Diff line
@@ -70,4 +70,4 @@ tuner=68 - Philips TUV1236D ATSC/NTSC dual in 
tuner=69 - Tena TNF 5335 MF

tuner=70 - Samsung TCPN 2121P30A

tuner=71 - Xceive xc3028

tuner=72 - FE6600
 
tuner=72 - Thomson FE6600

drivers/media/dvb/frontends/dvb-pll.c

+3 −3
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ struct dvb_pll_desc dvb_pll_philips_td1316 = { 
EXPORT_SYMBOL(dvb_pll_philips_td1316);



/* FE6600 used on DViCO Hybrid */

struct dvb_pll_desc dvb_pll_unknown_fe6600 = {

	.name = "FE6600",

struct dvb_pll_desc dvb_pll_thomson_fe6600 = {

	.name = "Thomson FE6600",

	.min =  44250000,

	.max = 858000000,

	.count = 4,
@@ -417,7 +417,7 @@ struct dvb_pll_desc dvb_pll_unknown_fe6600 = { 
		{ 999999999, 36213333, 166667, 0xf4, 0x18 },

	}

};

EXPORT_SYMBOL(dvb_pll_unknown_fe6600);

EXPORT_SYMBOL(dvb_pll_thomson_fe6600);



/* ----------------------------------------------------------- */

/* code                                                        */

drivers/media/dvb/frontends/dvb-pll.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ extern struct dvb_pll_desc dvb_pll_samsung_tbmv; 
extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;

extern struct dvb_pll_desc dvb_pll_philips_td1316;



extern struct dvb_pll_desc dvb_pll_unknown_fe6600;

extern struct dvb_pll_desc dvb_pll_thomson_fe6600;



int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,

		      u32 freq, int bandwidth);

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

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ struct cx88_board cx88_boards[] = { 
	},

	[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {

		.name           = "DViCO FusionHDTV DVB-T Hybrid",

		.tuner_type     = TUNER_FE6600,

		.tuner_type     = TUNER_THOMSON_FE6600,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

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

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int dvb_register(struct cx8802_dev *dev) 
#ifdef HAVE_ZL10353

	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:

		dev->core->pll_addr = 0x61;

		dev->core->pll_desc = &dvb_pll_unknown_fe6600;

		dev->core->pll_desc = &dvb_pll_thomson_fe6600;

		dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,

						   &dev->core->i2c_adap);

		break;