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

Commit 4ba24373 authored by Hermann Pitton's avatar Hermann Pitton Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7082): support for Twinhan Hybrid DTV-DVB 3056 PCI 



S-Video is unconfirmed, but likely correct.
The remote is not yet investigated.

Thanks go to Sioux for providing code and asking to fix the auto
detection.

Signed-off-by: default avatarsioux <sioux_it@libero.it>
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 c0e0aff9

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -129,3 +129,4 @@ 
128 -> Beholder BeholdTV Columbus TVFM          [0000:5201]

129 -> Beholder BeholdTV 607 / BeholdTV 609     [5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093]

130 -> Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193]

131 -> Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]

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

+39 −2
Original line number Diff line number Diff line
@@ -3912,6 +3912,36 @@ struct saa7134_board saa7134_boards[] = { 
		},

		.mpeg  = SAA7134_MPEG_EMPRESS,

	},

	[SAA7134_BOARD_TWINHAN_DTV_DVB_3056] = {

		.name           = "Twinhan Hybrid DTV-DVB 3056 PCI",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.tuner_config   = 2,

		.mpeg           = SAA7134_MPEG_DVB,

		.gpiomask       = 0x0200000,

		.inputs = {{

			.name   = name_tv,

			.vmux   = 1,

			.amux   = TV,

			.tv     = 1,

		}, {

			.name   = name_comp1,

			.vmux   = 3,

			.amux   = LINE1,

		}, {

			.name   = name_svideo,

			.vmux   = 8,		/* untested */

			.amux   = LINE1,

		} },

		.radio = {

			.name   = name_radio,

			.amux   = TV,

			.gpio   = 0x0200000,

		},

	},

};



const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4843,7 +4873,13 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x4e42,

		.subdevice    = 0x3502,

		.driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS

		.driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x1822, /*Twinhan Technology Co. Ltd*/

		.subdevice    = 0x0022,

		.driver_data  = SAA7134_BOARD_TWINHAN_DTV_DVB_3056,

	},{

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

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -5233,6 +5269,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:

	case SAA7134_BOARD_MEDION_MD8800_QUADRO:

	case SAA7134_BOARD_AVERMEDIA_SUPER_007:

	case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:

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

		 * and configure firmware eeprom address

		 */

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

+18 −0
Original line number Diff line number Diff line
@@ -779,6 +779,21 @@ static struct tda1004x_config avermedia_super_007_config = { 
	.request_firmware = philips_tda1004x_request_firmware

};



static struct tda1004x_config twinhan_dtv_dvb_3056_config = {

	.demod_address = 0x08,

	.invert        = 1,

	.invert_oclk   = 0,

	.xtal_freq     = TDA10046_XTAL_16M,

	.agc_config    = TDA10046_AGC_TDA827X,

	.gpio_config   = TDA10046_GP01_I,

	.if_freq       = TDA10046_FREQ_045,

	.i2c_gate      = 0x42,

	.tuner_address = 0x61,

	.tuner_config  = 2,

	.antenna_switch = 1,

	.request_firmware = philips_tda1004x_request_firmware

};



/* ------------------------------------------------------------------

 * special case: this card uses saa713x GPIO22 for the mode switch

 */
@@ -1044,6 +1059,9 @@ static int dvb_init(struct saa7134_dev *dev) 
	case SAA7134_BOARD_AVERMEDIA_SUPER_007:

		configure_tda827x_fe(dev, &avermedia_super_007_config);

		break;

	case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:

		configure_tda827x_fe(dev, &twinhan_dtv_dvb_3056_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
@@ -252,6 +252,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128

#define SAA7134_BOARD_BEHOLD_607_9FM	129

#define SAA7134_BOARD_BEHOLD_M6		130

#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8