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

Commit 2f180710 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: SAA7134 updates and board additions 



- Remove $Id CVS logs for V4L files
- linux/version.h replaced by linux/utsname.h
- Add new Digimatrix card and LG TAPC Mini tuner for it

Signed-off-by: default avatarHermann Pitton <hermann.pitton@onlinehome.de>
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 e52e98a7

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -62,3 +62,4 @@ 
 61 -> Philips TOUGH DVB-T reference design     [1131:2004]

 62 -> Compro VideoMate TV Gold+II

 63 -> Kworld Xpert TV PVR7134

 64 -> FlyTV mini Asus Digimatrix               [1043:0210,1043:0210]

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

+47 −1
Original line number Diff line number Diff line 
/*

 * $Id: saa7134-cards.c,v 1.80 2005/07/07 01:49:30 mkrufky Exp $

 *

 * device driver for philips saa7134 based TV cards

 * card-specific stuff.
@@ -2001,6 +2000,41 @@ struct saa7134_board saa7134_boards[] = { 
			.gpio = 0x000,

		},

	},

	[SAA7134_BOARD_FLYTV_DIGIMATRIX] = {

		.name		= "FlyTV mini Asus Digimatrix",

		.audio_clock	= 0x00200000,

		.tuner_type	= TUNER_LG_NTSC_TALN_MINI,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.inputs         = {{

			.name = name_tv,

			.vmux = 1,

			.amux = TV,

			.tv   = 1,

		},{

			.name = name_tv_mono,

			.vmux = 1,

			.amux = LINE2,

			.tv   = 1,

		},{

			.name = name_comp1,

			.vmux = 0,

			.amux = LINE2,

		},{

			.name = name_comp2,

			.vmux = 3,

			.amux = LINE2,

		},{

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE2,

		}},

		.radio = {

			.name = name_radio,		/* radio unconfirmed */

			.amux = LINE2,

		},

	},

};
@@ -2346,6 +2380,18 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x4e42,

		.subdevice    = 0x0502,

		.driver_data  = SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x1043,

		.subdevice    = 0x0210,		/* mini pci NTSC version */

		.driver_data  = SAA7134_BOARD_FLYTV_DIGIMATRIX,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,

		.subvendor    = 0x1043,

		.subdevice    = 0x0210,		/* mini pci PAL/SECAM version */

		.driver_data  = SAA7134_BOARD_FLYTV_DIGIMATRIX,



	},{

		/* --- boards without eeprom + subsystem ID --- */

drivers/media/video/saa7134/saa7134-core.c

+0 −1
Original line number Diff line number Diff line 
/*

 * $Id: saa7134-core.c,v 1.39 2005/07/05 17:37:35 nsh Exp $

 *

 * device driver for philips saa7134 based TV cards

 * driver core

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

+0 −1
Original line number Diff line number Diff line 
/*

 * $Id: saa7134-dvb.c,v 1.23 2005/07/24 22:12:47 mkrufky Exp $

 *

 * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]

 *

drivers/media/video/saa7134/saa7134-empress.c

+0 −1
Original line number Diff line number Diff line 
/*

 * $Id: saa7134-empress.c,v 1.11 2005/05/22 19:23:39 nsh Exp $

 *

 * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]

 *