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

Commit 633323ff authored by Bill Pechter's avatar Bill Pechter Committed by Linus Torvalds
Browse files

[PATCH] v4l:: (936) Support for sabrent bt848 version 



Support for Sabrent bt848 version.

Signed-off-by: default avatarBill Pechter <pechter@gmail.com>
Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8069695c

Documentation/video4linux/CARDLIST.bttv

+1 −0
Original line number Diff line number Diff line
@@ -140,3 +140,4 @@ 
139 -> Prolink PixelView PlayTV MPEG2 PV-M4900

140 -> Osprey 440                                          [0070:ff07]

141 -> Asound Skyeye PCTV

142 -> Sabrent TV-FM (bttv version)

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -67,3 +67,4 @@ tuner=65 - Ymec TVF66T5-B/DFF 
tuner=66 - LG NTSC (TALN mini series)

tuner=67 - Philips TD1316 Hybrid Tuner

tuner=68 - Philips TUV1236D ATSC/NTSC dual in

tuner=69 - Tena TNF 5335 MF

drivers/media/video/bttv-cards.c

+18 −1
Original line number Diff line number Diff line
@@ -2796,7 +2796,24 @@ struct tvcard bttv_tvcards[] = { 
		.tuner_addr	= ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

	},



		/* ---- card 0x8e ---------------------------------- */

	[BTTV_BOARD_SABRENT_TVFM] = {

		.name		= "Sabrent TV-FM (bttv version)",

		.video_inputs	= 3,

		.audio_inputs	= 1,

		.tuner		= 0,

		.svhs		= 2,

		.gpiomask	= 0x108007,

		.muxsel		= { 2, 3, 1, 1},

		.audiomux	= { 100000, 100002, 100002, 100000},

		.no_msp34xx	= 1,

		.no_tda9875     = 1,

		.no_tda7432     = 1,

		.pll		= PLL_28,

		.tuner_type	= TUNER_TNF_5335MF,

		.tuner_addr	= ADDR_UNSET,

		.has_radio      = 1,

	},

};



static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);

drivers/media/video/bttv.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
#define BTTV_BOARD_PV_M4900                0x8b

#define BTTV_BOARD_OSPREY440               0x8c

#define BTTV_BOARD_ASOUND_SKYEYE	   0x8d

#define BTTV_BOARD_SABRENT_TVFM   	   0x8e



/* i2c address list */

#define I2C_TSA5522        0xc2

drivers/media/video/tuner-simple.c

+3 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static struct tunertype tuners[] = { 
	{ "Ymec TVision TVF-5533MF", Philips, NTSC,

	  16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},



	/* 60-68 */

	/* 60-69 */

	{ "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,

	  16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},

	{ "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL,
@@ -252,6 +252,8 @@ static struct tunertype tuners[] = { 
	  16*160.00,16*442.00,0xa1,0xa2,0xa4,0xc8,623 },

	{ "Philips TUV1236D ATSC/NTSC dual in", Philips, ATSC,

	  16*157.25,16*454.00,0x01,0x02,0x04,0xce,732 },

	{ "Tena TNF 5335 MF", Philips, NTSC,

	  16*157.25,16*454.00,0x01,0x02,0x04,0x8e,732 },

};



unsigned const int tuner_count = ARRAY_SIZE(tuners);