- moved Philips FMD1216 radio specific setup to saa7134-core.c

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>

3 files changed, 7 insertions, 21 deletions

diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index e6bd23ba2..8f2eba0fd 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-core.c,v 1.31 2005/06/14 22:40:57 hhackmann Exp $
+ * $Id: saa7134-core.c,v 1.32 2005/06/16 23:00:22 hhackmann Exp $
  *
  * device driver for philips saa7134 based TV cards
  * driver core
@@ -1048,6 +1048,11 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 		}
         printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type);        
 		saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type;			
+		if (dev->tuner_type == TUNER_PHILIPS_FMD1216ME_MK3) {
+			dev->tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE;
+			saa7134_boards[SAA7134_BOARD_MD7134].tda9887_conf = dev->tda9887_conf;
+			saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG, &dev->tda9887_conf);
+		}
 		saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&dev->tuner_type);
 	}		
 
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 567288476..827b65e90 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -63,7 +63,6 @@ struct tda9887 {
 	unsigned int       radio;
 	unsigned int       config;
 	unsigned int       pinnacle_id;
-	unsigned int       philips_fmd_id;
 	unsigned int       using_v4l2;
 	unsigned int 	   radio_mode;
 };
@@ -245,13 +244,6 @@ static struct tvnorm radio_mono = {
 		  cRadioIF_38_90 ),
 };
 
-static struct tvnorm radio_philips_fmd = {
-	.name = "radio",
-	.b    = ( cFmRadio | cQSS | cAutoMuteFmActive),
-	.c    = ( cAudioGain6 | cDeemphasis50 | cDeemphasisOFF | 0x1f),
-	.e    = ( cGating_36 | cTunerGainLow | cRadioIF_38_90 | cAudioIF_5_5 ),
-};
-
 /* ---------------------------------------------------------------------- */
 
 static void dump_read_message(unsigned char *buf)
@@ -384,8 +376,6 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
 	int i;
 
 	if (t->radio) {
-		if (t-> philips_fmd_id) 
-			norm = &radio_philips_fmd;
 		if (t->radio_mode == V4L2_TUNER_MODE_MONO)
 			norm = &radio_mono;
 		else
@@ -587,10 +577,6 @@ static int tda9887_configure(struct tda9887 *t)
 	if (UNSET != t->pinnacle_id) {
 		tda9887_set_pinnacle(t,buf);
 	}
-	if ((t->radio) && (t->philips_fmd_id)) {
-		buf[1] &= ~cOutputPort1Inactive;
-		buf[1] &= ~cOutputPort2Inactive;
-	}
 	tda9887_set_config(t,buf);
 	tda9887_set_insmod(t,buf);
 
@@ -642,7 +628,6 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr,
 	t->client      = client_template;
 	t->std         = 0;
 	t->pinnacle_id = UNSET;
-	t->philips_fmd_id = 0;
 	t->radio_mode = V4L2_TUNER_MODE_STEREO;
 	
 	i2c_set_clientdata(&t->client, t);
@@ -711,9 +696,6 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 		tda9887_configure(t);
 		break;
 	}
-	case AUDC_CONFIG_PHILIPS_FMD:
-		t->philips_fmd_id = 1;
-		break;
 	case TDA9887_SET_CONFIG:
 	{
 		int *i = arg;
diff --git a/linux/include/media/audiochip.h b/linux/include/media/audiochip.h
index 0ec90d194..cd831168f 100644
--- a/linux/include/media/audiochip.h
+++ b/linux/include/media/audiochip.h
@@ -1,5 +1,5 @@
 /*
- * $Id: audiochip.h,v 1.4 2005/06/14 22:51:42 hhackmann Exp $
+ * $Id: audiochip.h,v 1.5 2005/06/16 22:59:16 hhackmann Exp $
  */
 
 #ifndef AUDIOCHIP_H
@@ -35,5 +35,4 @@
 
 /* misc stuff to pass around config info to i2c chips */
 #define AUDC_CONFIG_PINNACLE  _IOW('m',32,int)
-#define AUDC_CONFIG_PHILIPS_FMD _IO('m',33)
 #endif /* AUDIOCHIP_H */