msg

6 files changed, 35 insertions, 48 deletions

diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 014d47dfb..c956a0e84 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-cards.c,v 1.62 2005/06/14 22:38:46 hhackmann Exp $
+ * $Id: saa7134-cards.c,v 1.64 2005/06/15 17:36:11 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -1567,33 +1567,6 @@ struct saa7134_board saa7134_boards[] = {
 			.amux = LINE2,
 		}},
 	},
-    [SAA7134_BOARD_AVERMEDIA_307] = {
-           /*
-             Davydov Vladimir <vladimir@iqmedia.com>
-           */
-           .name           = "Avermedia AVerTV 307",
-           .audio_clock    = 0x00187de7,
-           .tuner_type     = TUNER_PHILIPS_FQ1216ME,
-           .tda9887_conf   = TDA9887_PRESENT,
-           .inputs         = {{
-                   .name = name_tv,
-                   .vmux = 1,
-                   .amux = TV,
-                   .tv   = 1,
-           },{
-                   .name = name_comp1,
-                   .vmux = 0,
-                   .amux = LINE1,
-           },{
-                   .name = name_comp2,
-                   .vmux = 3,
-                   .amux = LINE1,
-           },{
-                   .name = name_svideo,
-                   .vmux = 8,
-                   .amux = LINE1,
-           }},
-    },
 	[SAA7134_BOARD_PHILIPS_TOUGH] = {
 		.name           = "Philips TOUGH DVB-T reference design",
 		.tuner_type	= TUNER_ABSENT,
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index e03f80fa9..78647466a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-video.c,v 1.31 2005/06/14 22:49:20 hhackmann Exp $
+ * $Id: saa7134-video.c,v 1.33 2005/06/15 17:36:11 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -274,7 +274,6 @@ static struct saa7134_tvnorm tvnorms[] = {
 
 		.h_start       = 0,
 		.h_stop        = 719,
-		.video_v_start = 22,
   		.video_v_start = 23,
   		.video_v_stop  = 262,
   		.vbi_v_start_0 = 10,
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index f74ca74ea..92c9b1a76 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-simple.c,v 1.22 2005/06/14 22:52:59 hhackmann Exp $
+ * $Id: tuner-simple.c,v 1.24 2005/06/15 17:36:11 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
@@ -212,8 +212,6 @@ static struct tunertype tuners[] = {
 	  16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
 	{ "Philips FQ1236A MK4", Philips, NTSC,
 	  16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
-	{ "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL,
-	  16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 },          
 
 	/* Should work for TVF8531MF, TVF8831MF, TVF8731MF */
 	{ "Ymec TVision TVF-8531MF", Philips, NTSC,
@@ -228,6 +226,8 @@ static struct tunertype tuners[] = {
 	/* This entry is for TEA5767 FM radio only chip used on several boards w/TV tuner */
 	{ TEA5767_TUNER_NAME, Philips, RADIO,
           -1, -1, 0, 0, 0, TEA5767_LOW_LO_32768,0},	
+	{ "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL,
+	  16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 },          
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index afcd3e142..325397891 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -99,13 +99,14 @@
 
 #define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
 #define TUNER_PHILIPS_FQ1236A_MK4   57   /* Hauppauge PVR-500MCE NTSC */
-#define TUNER_PHILIPS_FMD1216ME_MK3 58
 
 #define TUNER_YMEC_TVF_8531MF 58
 #define TUNER_YMEC_TVF_5533MF 59	/* Pixelview Pro Ultra NTSC */
 #define TUNER_THOMSON_DTT7611 60
 #define TUNER_TENA_9533_DI    61
+
 #define TUNER_TEA5767         62	/* Only FM Radio Tuner */
+#define TUNER_PHILIPS_FMD1216ME_MK3 63
 
 #define TEA5767_TUNER_NAME "Philips TEA5767HN FM Radio"
 
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index db9e74626..46ea2f0dc 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-15 13:10 mkrufky
+	* tuner.h, tuner-simple.c:
+
+	- Move TUNER_PHILIPS_FMD1216ME_MK3 to tuner #63 to correct duplicate tuner #58 problem
+
+	* saa7134-cards.c:
+
+	- Remove duplicate entry for AVERMEDIA_307
+
+	* saa7134-video.c:
+
+	- set video_v_start also for PAL_60 to line 23 and only line 23.
+	  Thanks to Hermann Pitton <hermann.pitton@onlinehome.de>
+
 2005-06-15 02:14 mchehab
 	* Make.config, Makefile, tuner-core.c:
 
@@ -20,43 +34,43 @@
 	- typo corrected.
 
 2005-06-14 04:08 Hartmut Hackmann
-	* saa7134-cards.c saa7134.h
+	* saa7134-cards.c saa7134.h:
 	- added entry for Philips TOUGH Reference design
 	- added code to turn the fan of the Lifeview and Typhoon cardbus nodules on
 	- corrected Lifeview Cardbus entries
 	- corrected Medion MD7134 entries
 
-	* saa7134-core.c
+	* saa7134-core.c:
 	- distinguish the different variants of the Medion MD7134 modules via eeprom
 
-	* saa7134-dvb.c
+	* saa7134-dvb.c:
 	- DVB-T support for MD7134 cardbus and the PCI variants
 	- initial DVB-T support for Lifeview Flydvb-t duo
 	- DVB-T support for Philips TOUGH reference design
 	
-	* saa7134-ts.c
+	* saa7134-ts.c:
 	- fixed minor bug in DMA IRQ handler
 	
-	* saa7134-video.c
+	* saa7134-video.c:
 	- turn off planar mode at video release (would break DVB)
 	- put tda8290 and tda8275 to sleep at video release to save power
 	- special FM stereo configuration for FMD1216 tuner
 	
-	* tda8290.c 
+	* tda8290.c:
 	- initialize tuner to sleep mode to save power
 	
-	* tda9887.c audiochip.h
+	* tda9887.c audiochip.h:
 	- special FM stereo configuration for FMD1216 tuner via i2c client call 
 	
-	* tuner.h tuner-core.c tuner-simple.c
+	* tuner.h tuner-core.c tuner-simple.c:
 	- support for Philips FMD12ME hybrid tuner
 	- allow to initialize with another tuner
 	
-	* video-buf-dvb.c video-buf-dvb.h
+	* video-buf-dvb.c video-buf-dvb.h:
 	- adapt to dvb core change in 2.6.12-rc4
 	
 2005-06-13 04:08 Hartmut Hackmann
-	* saa7134-tvaudio.c saa7134-ossc
+	* saa7134-tvaudio.c saa7134-ossc:
 	- corrected off by 1 error in DMA memory allocation
 	- corrected oss sound routing for saa7134 and saa7133 
 
diff --git a/v4l/Make.config b/v4l/Make.config
index d8d663e61..ab8260e8e 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -15,12 +15,12 @@ CONFIG_USE_I2C_RANGE	:= y
 CONFIG_VIDEO_CX88_DVB	:= n
 CONFIG_VIDEO_SAA7134_DVB := n
 ifeq ($(SUBLEVEL),10)
- CONFIG_VIDEO_CX88_DVB	:= m
- CONFIG_VIDEO_SAA7134_DVB := m
+ CONFIG_VIDEO_CX88_DVB	:= n
+ CONFIG_VIDEO_SAA7134_DVB := n
 endif
 ifeq ($(SUBLEVEL),11)
- CONFIG_VIDEO_CX88_DVB	:= m
- CONFIG_VIDEO_SAA7134_DVB := m
+ CONFIG_VIDEO_CX88_DVB	:= n
+ CONFIG_VIDEO_SAA7134_DVB := n
 endif