1 files changed, 36 insertions, 9 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index b6f002e8421d..93dd61978541 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-i2c.c,v 1.11 2005/06/12 01:36:14 mchehab Exp $
+ * $Id: saa7134-i2c.c,v 1.19 2005/07/07 01:49:30 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * i2c interface support
@@ -197,10 +197,6 @@ static inline int i2c_send_byte(struct saa7134_dev *dev,
         enum i2c_status status;
         __u32 dword;
 
-#if 0
-        i2c_set_attr(dev,attr);
-        saa_writeb(SAA7134_I2C_DATA, data);
-#else
         /* have to write both attr + data in one 32bit word */
         dword  = saa_readl(SAA7134_I2C_ATTR_STATUS >> 2);
         dword &= 0x0f;
@@ -210,7 +206,6 @@ static inline int i2c_send_byte(struct saa7134_dev *dev,
 //      dword |= 0x40 << 16;  /* 400 kHz */
         dword |= 0xf0 << 24;
         saa_writel(SAA7134_I2C_ATTR_STATUS >> 2, dword);
-#endif
         d2printk(KERN_DEBUG "%s: i2c data => 0x%x\n",dev->name,data);
 
         if (!i2c_is_busy_wait(dev))
@@ -331,12 +326,44 @@ static u32 functionality(struct i2c_adapter *adap)
 
 static int attach_inform(struct i2c_client *client)
 {
-        struct saa7134_dev *dev = client->adapter->algo_data;
+        struct saa7134_dev *dev = client->adapter->algo_data;
         int tuner = dev->tuner_type;
         int conf  = dev->tda9887_conf;
+        struct tuner_setup tun_setup;
+
+        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
+                client->driver->name,client->addr,i2c_clientname(client));
+
+        if (!client->driver->command)
+                return 0;
+
+        if (saa7134_boards[dev->board].radio_type != UNSET) {
+
+                tun_setup.type = saa7134_boards[dev->board].radio_type;
+                tun_setup.addr = saa7134_boards[dev->board].radio_addr;
+
+                if ((tun_setup.addr == ADDR_UNSET) || (tun_setup.addr == client->addr)) {
+                        tun_setup.mode_mask = T_RADIO;
+
+                        client->driver->command(client, TUNER_SET_TYPE_ADDR, &tun_setup);
+                }
+        }
+
+        if (tuner != UNSET) {
+
+                tun_setup.type = tuner;
+                tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
+
+                if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) {
+
+                        tun_setup.mode_mask = T_ANALOG_TV;
+
+                        client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup);
+                }
+        }
+
+        client->driver->command(client, TDA9887_SET_CONFIG, &conf);
 
-        saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&tuner);
-        saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG,&conf);
         return 0;
 }