[linux-dvb] [PATCH 1/2] saa7134-dvb: LifeView FlyDVB-T Support

[Giampiero Giancipoli]

Added support for LifeView FlyDVB-T card

Signed-off-by: Giampiero Giancipoli <gianci at libero.it>
---
Index: linux/drivers/media/video/saa7134/saa7134-cards.c
===================================================================
RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c,v
retrieving revision 1.124
diff -u -b -B -w -p -u -p -r1.124 saa7134-cards.c
--- linux/drivers/media/video/saa7134/saa7134-cards.c	19 Jan 2006 15:33:09 -0000	1.124
+++ linux/drivers/media/video/saa7134/saa7134-cards.c	27 Jan 2006 13:47:47 -0000
@@ -2624,6 +2624,26 @@ struct saa7134_board saa7134_boards[] = 
 			.gpio = 0x000000,	/* GPIO21=Low for FM radio antenna */
 		},
 	},
+	[SAA7134_BOARD_FLYDVBT] = {
+		/* LifeView FlyDVB-T */
+		/* Giampiero Giancipoli <gianci at libero.it> */
+		.name           = "LifeView FlyDVB-T",
+		.audio_clock    = 0x00200000,
+		.tuner_type     = TUNER_ABSENT,
+		.radio_type     = UNSET,
+		.tuner_addr	= ADDR_UNSET,
+		.radio_addr	= ADDR_UNSET,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs         = {{
+			.name = name_comp1,	/* Composite input */
+			.vmux = 3,
+			.amux = LINE2,
+		},{
+			.name = name_svideo,	/* S-Video signal on S-Video input */
+			.vmux = 8,
+			.amux = LINE2,
+		}},
+	},
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3095,6 +3115,12 @@ struct pci_device_id saa7134_pci_tbl[] =
 		.subdevice    = 0x0319,
 		.driver_data  = SAA7134_BOARD_FLYDVB_TRIO,
 	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x5168,
+		.subdevice    = 0x0301, 
+		.driver_data  = SAA7134_BOARD_FLYDVBT,	
+	},{
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3231,6 +3257,7 @@ int saa7134_board_init1(struct saa7134_d
 	case SAA7134_BOARD_GOTVIEW_7135:
 	case SAA7134_BOARD_KWORLD_TERMINATOR:
 	case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
+	case SAA7134_BOARD_FLYDVBT:	
 		dev->has_remote = SAA7134_REMOTE_GPIO;
 		break;
 	case SAA7134_BOARD_MD5044:
Index: linux/drivers/media/video/saa7134/saa7134-dvb.c
===================================================================
RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c,v
retrieving revision 1.38
diff -u -b -B -w -p -u -p -r1.38 saa7134-dvb.c
--- linux/drivers/media/video/saa7134/saa7134-dvb.c	19 Jan 2006 15:33:09 -0000	1.38
+++ linux/drivers/media/video/saa7134/saa7134-dvb.c	27 Jan 2006 13:47:48 -0000
@@ -867,6 +867,10 @@ static int dvb_init(struct saa7134_dev *
 		dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
 						    &dev->i2c_adap);
 		break;
+	case SAA7134_BOARD_FLYDVBT:
+		dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
+						    &dev->i2c_adap);
+		break;
 	case SAA7134_BOARD_PHILIPS_EUROPA:
 		dev->dvb.frontend = tda10046_attach(&philips_europa_config,
 						    &dev->i2c_adap);
Index: linux/drivers/media/video/saa7134/saa7134-input.c
===================================================================
RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c,v
retrieving revision 1.54
diff -u -b -B -w -p -u -p -r1.54 saa7134-input.c
--- linux/drivers/media/video/saa7134/saa7134-input.c	18 Jan 2006 20:41:55 -0000	1.54
+++ linux/drivers/media/video/saa7134/saa7134-input.c	27 Jan 2006 13:47:48 -0000
@@ -232,6 +232,11 @@ int saa7134_input_init1(struct saa7134_d
 		mask_keycode = 0x003F00;
 		mask_keyup   = 0x040000;
 		break;
+	case SAA7134_BOARD_FLYDVBT:
+		ir_codes     = ir_codes_flydvb;
+		mask_keycode = 0x0001F00;
+		mask_keydown = 0x0040000;
+		break;
 	}
 	if (NULL == ir_codes) {
 		printk("%s: Oops: IR config error [card=%d]\n",
Index: linux/drivers/media/video/saa7134/saa7134.h
===================================================================
RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h,v
retrieving revision 1.89
diff -u -b -B -w -p -u -p -r1.89 saa7134.h
--- linux/drivers/media/video/saa7134/saa7134.h	19 Jan 2006 15:33:09 -0000	1.89
+++ linux/drivers/media/video/saa7134/saa7134.h	27 Jan 2006 13:47:48 -0000
@@ -218,6 +218,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_MSI_TVATANYWHERE_PLUS  82
 #define SAA7134_BOARD_CINERGY250PCI 83
 #define SAA7134_BOARD_FLYDVB_TRIO 84
+#define SAA7134_BOARD_FLYDVBT 85
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8