Commit 7b5b3f17 authored by Hermann Pitton's avatar Hermann Pitton Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7229): saa7134: add support for the Creatix CTX953_V.1.4.3 Hybrid 



Signed-off-by: default avatarHermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1b1cee35

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -132,3 +132,4 @@ 
131 -> Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]

132 -> Genius TVGO AM11MCE

133 -> NXP Snake DVB-S reference design

134 -> Medion/Creatix CTX953 Hybrid             [16be:0010]

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

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

		} },

	},

	[SAA7134_BOARD_CREATIX_CTX953] = {

		.name         = "Medion/Creatix CTX953 Hybrid",

		.audio_clock  = 0x00187de7,

		.tuner_type   = TUNER_PHILIPS_TDA8290,

		.radio_type   = UNSET,

		.tuner_addr   = ADDR_UNSET,

		.radio_addr   = ADDR_UNSET,

		.tuner_config = 0,

		.mpeg         = SAA7134_MPEG_DVB,

		.inputs       = {{

			.name = name_tv,

			.vmux = 1,

			.amux = TV,

			.tv   = 1,

		}, {

			.name = name_comp1,

			.vmux = 0,

			.amux = LINE1,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

		} },

	},

};



const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4960,6 +4984,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1822, /*Twinhan Technology Co. Ltd*/

		.subdevice    = 0x0022,

		.driver_data  = SAA7134_BOARD_TWINHAN_DTV_DVB_3056,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x16be,

		.subdevice    = 0x0010, /* Medion version CTX953_V.1.4.3 */

		.driver_data  = SAA7134_BOARD_CREATIX_CTX953,

	},{

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

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -5359,6 +5389,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
	case SAA7134_BOARD_MEDION_MD8800_QUADRO:

	case SAA7134_BOARD_AVERMEDIA_SUPER_007:

	case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:

	case SAA7134_BOARD_CREATIX_CTX953:

		/* this is a hybrid board, initialize to analog mode

		 * and configure firmware eeprom address

		 */

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

+3 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,9 @@ static int dvb_init(struct saa7134_dev *dev) 
				wprintk("%s: No lnbp21 found!\n", __FUNCTION__);

		}

		break;

	case SAA7134_BOARD_CREATIX_CTX953:

		configure_tda827x_fe(dev, &md8800_dvbt_config);

		break;

	default:

		wprintk("Huh? unknown DVB card?\n");

		break;

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131

#define SAA7134_BOARD_GENIUS_TVGO_A11MCE   132

#define SAA7134_BOARD_PHILIPS_SNAKE        133

#define SAA7134_BOARD_CREATIX_CTX953       134



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8