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

Commit cf1c5d1d authored by Pieter Palmers's avatar Pieter Palmers Committed by Linus Torvalds
Browse files

[PATCH] v4l: 796: add sknet monster tv mobile card 



- Add SKNet Monster TV Mobile card.

Signed-off-by: default avatarPieter Palmers <pieterp@joow.be>
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 3ae1adc6

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -74,3 +74,4 @@ 
 73 -> RTD Embedded Technologies VFG7330        [1435:7330]

 74 -> LifeView FlyTV Platinum Mini2            [14c0:1212]

 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]

 76 -> SKNet MonsterTV Mobile                   [1131:4ee9]

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

+34 −2
Original line number Diff line number Diff line
@@ -2368,6 +2368,29 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE2,

		}},

	},

	[SAA7134_BOARD_MONSTERTV_MOBILE] = {

		.name           = "SKNet MonsterTV Mobile",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,



		.inputs         = {{

			  .name = name_tv,

			  .vmux = 1,

			  .amux = TV,

			  .tv   = 1,

		},{

			  .name = name_comp1,

			  .vmux = 3,

			  .amux = LINE1,

		},{

			  .name = name_svideo,

			  .vmux = 6,

			  .amux = LINE1,

		}},

	},

};



const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2779,6 +2802,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
 		.subvendor    = 0x1461,

 		.subdevice    = 0x1044,

 		.driver_data  = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180,

 	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x1131,

		.subdevice    = 0x4ee9,

		.driver_data  = SAA7134_BOARD_MONSTERTV_MOBILE,

 	},{

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

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -2889,7 +2918,10 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
		/* power-up tuner chip */

		saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);

		saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);

		msleep(1);

	case SAA7134_BOARD_MONSTERTV_MOBILE:

		/* power-up tuner chip */

		saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);

		saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000004);

		break;

	case SAA7134_BOARD_FLYDVBTDUO:

	case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS:

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_RTD_VFG7330 73

#define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74

#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75

#define SAA7134_BOARD_MONSTERTV_MOBILE 76



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8