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

Commit f689d908 authored by Adam Glover's avatar Adam Glover Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9063): Add ADS Tech Instant HDTV PCI support 



Add PCI ID and device specific tables for ADS Tech Instant HDTV.

[mchehab@redhat.com: make checkpatch happy and fix merge conflicts]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a31d2bb7

Documentation/video4linux/CARDLIST.saa7134

+2 −1
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
145 -> AVerMedia MiniPCI DVB-T Hybrid M103      [1461:f636]

146 -> ASUSTeK P7131 Analog

147 -> Asus Tiger 3in1                          [1043:4878]

147 -> Zogis Real Angel 220

148 -> Encore ENLTV-FM v5.3                     [1a7f:2008]

149 -> Avermedia PCI pure analog (M135A)        [1461:f11d]

150 -> Zogis Real Angel 220

151 -> ADS Tech Instant HDTV                    [1421:0380]

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

+31 −0
Original line number Diff line number Diff line
@@ -4548,6 +4548,30 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = TV,

		},

	},

	[SAA7134_BOARD_ADS_INSTANT_HDTV_PCI] = {

		.name           = "ADS Tech Instant HDTV",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TUV1236D,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.mpeg           = SAA7134_MPEG_DVB,

		.inputs         = { {

			.name = name_tv,

			.vmux = 1,

			.amux = TV,

			.tv   = 1,

		}, {

			.name = name_comp,

		       .vmux = 4,

		       .amux = LINE1,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

		} },

	},

};



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

		.subdevice    = 0xc900,

		.driver_data  = SAA7134_BOARD_VIDEOMATE_T750,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */

		.subvendor    = 0x1421,

		.subdevice    = 0x0380,

		.driver_data  = SAA7134_BOARD_ADS_INSTANT_HDTV_PCI,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -6195,6 +6225,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		i2c_transfer(&dev->i2c_adap, &msg, 1);

		break;

	}

	case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:

	case SAA7134_BOARD_KWORLD_ATSC110:

	{

		/* enable tuner */

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

+1 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ static int dvb_init(struct saa7134_dev *dev) 
			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,

				   NULL, DVB_PLL_TDHU2);

		break;

	case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:

	case SAA7134_BOARD_KWORLD_ATSC110:

		dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,

					       &dev->i2c_adap);

drivers/media/video/saa7134/saa7134.h

+2 −1
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ struct saa7134_format { 
#define SAA7134_BOARD_ASUSTeK_TIGER_3IN1   147

#define SAA7134_BOARD_ENCORE_ENLTV_FM53 148

#define SAA7134_BOARD_AVERMEDIA_M135A    149

#define SAA7134_BOARD_REAL_ANGEL_220     147

#define SAA7134_BOARD_REAL_ANGEL_220     150

#define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI  151



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8