vserver 2.0 rc7

[linux-2.6.git] / drivers / media / video / saa7134 / saa7134-i2c.c

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index fa6cfbb..702bb63 100644 (file)
--- 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.7 2004/11/07 13:17:15 kraxel Exp $
+ * $Id: saa7134-i2c.c,v 1.10 2005/01/24 17:37:23 kraxel Exp $
  *
  * device driver for philips saa7134 based TV cards
  * i2c interface support
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -205,7 +206,8 @@ static inline int i2c_send_byte(struct saa7134_dev *dev,
        dword &= 0x0f;
        dword |= (attr << 6);
        dword |= ((__u32)data << 8);
-       dword |= 0x00 << 16;
+       dword |= 0x00 << 16;  /* 100 kHz */
+//     dword |= 0x40 << 16;  /* 400 kHz */
        dword |= 0xf0 << 24;
        saa_writel(SAA7134_I2C_ATTR_STATUS >> 2, dword);
 #endif
@@ -236,7 +238,7 @@ static inline int i2c_recv_byte(struct saa7134_dev *dev)
 }
 
 static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
-                           struct i2c_msg msgs[], int num)
+                           struct i2c_msg *msgs, int num)
 {
        struct saa7134_dev *dev = i2c_adap->algo_data;
        enum i2c_status status;
@@ -248,13 +250,24 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                if (!i2c_reset(dev))
                        return -EIO;
 
+       d2printk("start xfer\n");
        d1printk(KERN_DEBUG "%s: i2c xfer:",dev->name);
        for (i = 0; i < num; i++) {
                if (!(msgs[i].flags & I2C_M_NOSTART) || 0 == i) {
                        /* send address */
+                       d2printk("send address\n");
                        addr  = msgs[i].addr << 1;
                        if (msgs[i].flags & I2C_M_RD)
                                addr |= 1;
+                       if (i > 0 && msgs[i].flags & I2C_M_RD) {
+                               /* workaround for a saa7134 i2c bug
+                                * needed to talk to the mt352 demux
+                                * thanks to pinnacle for the hint */
+                               int quirk = 0xfd;
+                               d1printk(" [%02x quirk]",quirk);
+                               i2c_send_byte(dev,START,quirk);
+                               i2c_recv_byte(dev);
+                       }
                        d1printk(" < %02x", addr);
                        rc = i2c_send_byte(dev,START,addr);
                        if (rc < 0)
@@ -262,6 +275,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                }
                if (msgs[i].flags & I2C_M_RD) {
                        /* read bytes */
+                       d2printk("read bytes\n");
                        for (byte = 0; byte < msgs[i].len; byte++) {
                                d1printk(" =");
                                rc = i2c_recv_byte(dev);
@@ -272,6 +286,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                        }
                } else {
                        /* write bytes */
+                       d2printk("write bytes\n");
                        for (byte = 0; byte < msgs[i].len; byte++) {
                                data = msgs[i].buf[byte];
                                d1printk(" %02x", data);
@@ -281,6 +296,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                        }
                }
        }
+       d2printk("xfer done\n");
        d1printk(" >");
        i2c_set_attr(dev,STOP);
        rc = -EIO;
@@ -313,18 +329,6 @@ static u32 functionality(struct i2c_adapter *adap)
        return I2C_FUNC_SMBUS_EMUL;
 }
 
-#ifndef I2C_PEC
-static void inc_use(struct i2c_adapter *adap)
-{
-       MOD_INC_USE_COUNT;
-}
-
-static void dec_use(struct i2c_adapter *adap)
-{
-       MOD_DEC_USE_COUNT;
-}
-#endif
-
 static int attach_inform(struct i2c_client *client)
 {
         struct saa7134_dev *dev = client->adapter->algo_data;
@@ -345,12 +349,7 @@ static struct i2c_algorithm saa7134_algo = {
 };
 
 static struct i2c_adapter saa7134_adap_template = {
-#ifdef I2C_PEC
        .owner         = THIS_MODULE,
-#else
-       .inc_use       = inc_use,
-       .dec_use       = dec_use,
-#endif
 #ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
 #endif
@@ -362,7 +361,6 @@ static struct i2c_adapter saa7134_adap_template = {
 
 static struct i2c_client saa7134_client_template = {
        I2C_DEVNAME("saa7134 internal"),
-        .id        = -1,
 };
 
 /* ----------------------------------------------------------- */