Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[powerpc.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 711aa8e..6162550 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -30,6 +30,7 @@
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
+#include <media/v4l2-common.h>
 
 /* ----------------------------------------------------------- */
 
@@ -239,7 +240,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
        unsigned char data;
        int addr,rc,i,byte;
 
-       status = i2c_get_status(dev);
+       status = i2c_get_status(dev);
        if (!i2c_is_idle(status))
                if (!i2c_reset(dev))
                        return -EIO;
@@ -296,7 +297,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
        rc = -EIO;
        if (!i2c_is_busy_wait(dev))
                goto err;
-       status = i2c_get_status(dev);
+       status = i2c_get_status(dev);
        if (i2c_is_error(status))
                goto err;
        /* ensure that the bus is idle for at least one bit slot */
@@ -333,7 +334,21 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
 
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name, client->addr, client->name);
+               client->driver->driver.name, client->addr, client->name);
+
+       /* Am I an i2c remote control? */
+
+       switch (client->addr) {
+               case 0x7a:
+               case 0x47:
+               {
+                       struct IR_i2c *ir = i2c_get_clientdata(client);
+                       d1printk("%s i2c IR detected (%s).\n",
+                                client->driver->driver.name, ir->phys);
+                       saa7134_set_i2c_ir(dev,ir);
+                       break;
+               }
+       }
 
        if (!client->driver->command)
                return 0;
@@ -348,12 +363,12 @@ static int attach_inform(struct i2c_client *client)
 
                        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;
+               tun_setup.type = tuner;
+               tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
 
                if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) {
 
@@ -361,11 +376,11 @@ static int attach_inform(struct i2c_client *client)
 
                        client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup);
                }
-        }
+       }
 
        client->driver->command(client, TDA9887_SET_CONFIG, &conf);
 
-        return 0;
+       return 0;
 }
 
 static struct i2c_algorithm saa7134_algo = {
@@ -376,9 +391,7 @@ static struct i2c_algorithm saa7134_algo = {
 
 static struct i2c_adapter saa7134_adap_template = {
        .owner         = THIS_MODULE,
-#ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
-#endif
        .name          = "saa7134",
        .id            = I2C_HW_SAA7134,
        .algo          = &saa7134_algo,