[linux-dvb] [PATCH] ERRATA: Lifeview FlyDVB-T support

[Giampiero Giancipoli]

Alas, there is a blunder in my patch :( in saa1734-dvb.c:
tda827x_flydvbt_config instead of tda827x_lifeview_config, a residuate
of my firmware upload experiments.

I sincerely apologize, the fixed patch included.

Ciao,
Gianci
-------------- next part --------------
diff -ur /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
--- /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	2006-01-11 22:26:52.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	2006-01-14 20:15:30.000000000 +0100
@@ -2624,6 +2624,27 @@
 			.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 = LINE1,
+		},{
+			.name = name_svideo,	/* S-Video signal on S-Video input */
+			.vmux = 8,
+			.amux = LINE1,
+		}},
+	},
+
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2943,6 +2964,12 @@
 		.driver_data  = SAA7134_BOARD_FLYDVBTDUO,
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x5168,
+		.subdevice    = 0x0301, 
+		.driver_data  = SAA7134_BOARD_FLYDVBT,	
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
 		.subvendor    = 0x1461, /* Avermedia Technologies Inc */
 		.subdevice    = 0xf31f,
@@ -3199,6 +3226,7 @@
 		break;
 	case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
 	case SAA7134_BOARD_FLYTVPLATINUM_FM:
+	case SAA7134_BOARD_FLYDVBT:	
 	case SAA7134_BOARD_CINERGY400:
 	case SAA7134_BOARD_CINERGY600:
 	case SAA7134_BOARD_CINERGY600_MK3:
diff -ur /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c
--- /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c	2006-01-01 18:17:39.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c	2006-01-14 20:16:31.000000000 +0100
@@ -859,6 +859,10 @@
 		dev->dvb.frontend = tda10046_attach(&philips_tu1216_60_config,
 						    &dev->i2c_adap);
 		break;
+	case SAA7134_BOARD_FLYDVBT:
+		dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
+						    &dev->i2c_adap);
+		break;
 	case SAA7134_BOARD_FLYDVBTDUO:
 		dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
 						    &dev->i2c_adap);
diff -ur /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h
--- /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h	2006-01-04 14:30:55.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h	2006-01-14 20:15:30.000000000 +0100
@@ -218,6 +218,7 @@
 #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
diff -ur /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c
--- /home/gianci/cvs/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c	2006-01-09 22:44:23.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c	2006-01-14 20:15:30.000000000 +0100
@@ -74,7 +74,6 @@
 	[   16 ] = KEY_ENTER,      // Enter
 };
 
-#if 0
 static IR_KEYTAB_TYPE flydvb_codes[IR_KEYTAB_SIZE] = {
 	[  1 ] = KEY_ZOOM,		// Full Screen
 	[  0 ] = KEY_POWER,		// Power
@@ -113,7 +112,6 @@
 	[ 17 ] = KEY_STOP,		// Stop
 	[ 14 ] = KEY_NEXT,		// End >>|
 };
-#endif
 
 static IR_KEYTAB_TYPE cinergy_codes[IR_KEYTAB_SIZE] = {
 	[    0 ] = KEY_KP0,
@@ -683,6 +681,11 @@
 		mask_keycode = 0xEC00000;
 		mask_keydown = 0x0040000;
 		break;
+	case SAA7134_BOARD_FLYDVBT:
+		ir_codes     = flydvb_codes;
+		mask_keycode = 0x0001F00;
+		mask_keydown = 0x0040000;
+		break;
 	case SAA7134_BOARD_CINERGY400:
 	case SAA7134_BOARD_CINERGY600:
 	case SAA7134_BOARD_CINERGY600_MK3: