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

Commit 9c6f97a0 authored by Dmitri Belimov's avatar Dmitri Belimov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13945): Add lost config and PCI ID for card of Beholder 



Add lost configuration for our TV card.

Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7de0b873

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -174,3 +174,4 @@ 
173 -> Zolid Hybrid TV Tuner PCI                [1131:2004]

174 -> Asus Europa Hybrid OEM                   [1043:4847]

175 -> Leadtek Winfast DTV1000S                 [107d:6655]

176 -> Beholder BeholdTV 505 RDS                [0000:5051]

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

+45 −3
Original line number Diff line number Diff line
@@ -4160,7 +4160,7 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE2,

		},

	},

	[SAA7134_BOARD_BEHOLD_505RDS] = {

	[SAA7134_BOARD_BEHOLD_505RDS_MK5] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 505 RDS",
@@ -5320,6 +5320,41 @@ struct saa7134_board saa7134_boards[] = { 
			.vmux = 8,

		} },

	},

	[SAA7134_BOARD_BEHOLD_505RDS_MK3] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 505 RDS",

		.audio_clock    = 0x00200000,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.rds_addr 	= 0x10,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_tv,

			.vmux = 3,

			.amux = LINE2,

			.tv   = 1,

		}, {

			.name = name_comp1,

			.vmux = 1,

			.amux = LINE1,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

		} },

		.mute = {

			.name = name_mute,

			.amux = LINE1,

		},

		.radio = {

			.name = name_radio,

			.amux = LINE2,

		},

	},



};
@@ -6235,7 +6270,13 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,

		.subvendor    = 0x0000,

		.subdevice    = 0x505B,

		.driver_data  = SAA7134_BOARD_BEHOLD_505RDS,

		.driver_data  = SAA7134_BOARD_BEHOLD_505RDS_MK5,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,

		.subvendor    = 0x0000,

		.subdevice    = 0x5051,

		.driver_data  = SAA7134_BOARD_BEHOLD_505RDS_MK3,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -6792,7 +6833,8 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_BEHOLD_407FM:

	case SAA7134_BOARD_BEHOLD_409:

	case SAA7134_BOARD_BEHOLD_505FM:

	case SAA7134_BOARD_BEHOLD_505RDS:

	case SAA7134_BOARD_BEHOLD_505RDS_MK5:

	case SAA7134_BOARD_BEHOLD_505RDS_MK3:

	case SAA7134_BOARD_BEHOLD_507_9FM:

	case SAA7134_BOARD_BEHOLD_507RDS_MK3:

	case SAA7134_BOARD_BEHOLD_507RDS_MK5:

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

+2 −1
Original line number Diff line number Diff line
@@ -568,7 +568,8 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_BEHOLD_407FM:

	case SAA7134_BOARD_BEHOLD_409:

	case SAA7134_BOARD_BEHOLD_505FM:

	case SAA7134_BOARD_BEHOLD_505RDS:

	case SAA7134_BOARD_BEHOLD_505RDS_MK5:

	case SAA7134_BOARD_BEHOLD_505RDS_MK3:

	case SAA7134_BOARD_BEHOLD_507_9FM:

	case SAA7134_BOARD_BEHOLD_507RDS_MK3:

	case SAA7134_BOARD_BEHOLD_507RDS_MK5:

drivers/media/video/saa7134/saa7134.h

+2 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_HAUPPAUGE_HVR1120   156

#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157

#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158

#define SAA7134_BOARD_BEHOLD_505RDS         159

#define SAA7134_BOARD_BEHOLD_505RDS_MK5     159

#define SAA7134_BOARD_BEHOLD_507RDS_MK3     160

#define SAA7134_BOARD_BEHOLD_507RDS_MK5     161

#define SAA7134_BOARD_BEHOLD_607FM_MK5      162
@@ -299,6 +299,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_ZOLID_HYBRID_PCI		173

#define SAA7134_BOARD_ASUS_EUROPA_HYBRID	174

#define SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S 175

#define SAA7134_BOARD_BEHOLD_505RDS_MK3     176



#define SAA7134_MAXBOARDS 32

#define SAA7134_INPUT_MAX 8