git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / video / riva / rivafb-i2c.c
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 4b72002..01b85e3 100644 (file)
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -12,24 +12,22 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/fb.h>
+#include <linux/jiffies.h>
 
 #include <asm/io.h>
 
 #include "rivafb.h"
 #include "../edid.h"
 
-#define RIVA_DDC       0x50
-
 static void riva_gpio_setscl(void* data, int state)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val;
 
@@ -47,7 +45,7 @@ static void riva_gpio_setscl(void* data, int state)
 
 static void riva_gpio_setsda(void* data, int state)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val;
 
@@ -65,7 +63,7 @@ static void riva_gpio_setsda(void* data, int state)
 
 static int riva_gpio_getscl(void* data)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val = 0;
 
@@ -80,7 +78,7 @@ static int riva_gpio_getscl(void* data)
 
 static int riva_gpio_getsda(void* data)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val = 0;
 
@@ -91,14 +89,13 @@ static int riva_gpio_getsda(void* data)
        return val;
 }
 
-#define I2C_ALGO_RIVA   0x0e0000
 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
 {
        int rc;
 
        strcpy(chan->adapter.name, name);
        chan->adapter.owner             = THIS_MODULE;
-       chan->adapter.id                = I2C_ALGO_RIVA;
+       chan->adapter.id                = I2C_HW_B_RIVA;
        chan->adapter.algo_data         = &chan->algo;
        chan->adapter.dev.parent        = &chan->par->pdev->dev;
        chan->algo.setsda               = riva_gpio_setsda;
@@ -106,8 +103,7 @@ static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
        chan->algo.getsda               = riva_gpio_getsda;
        chan->algo.getscl               = riva_gpio_getscl;
        chan->algo.udelay               = 40;
-       chan->algo.mdelay               = 5;
-       chan->algo.timeout              = 20;
+       chan->algo.timeout              = msecs_to_jiffies(2);
        chan->algo.data                 = chan;
 
        i2c_set_adapdata(&chan->adapter, chan);
@@ -120,101 +116,52 @@ static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
        rc = i2c_bit_add_bus(&chan->adapter);
        if (rc == 0)
                dev_dbg(&chan->par->pdev->dev, "I2C bus %s registered.\n", name);
-       else
-               dev_warn(&chan->par->pdev->dev, "Failed to register I2C bus %s.\n", name);
+       else {
+               dev_warn(&chan->par->pdev->dev,
+                        "Failed to register I2C bus %s.\n", name);
+               chan->par = NULL;
+       }
+
        return rc;
 }
 
 void riva_create_i2c_busses(struct riva_par *par)
 {
+       par->bus = 3;
+
        par->chan[0].par        = par;
        par->chan[1].par        = par;
        par->chan[2].par        = par;
 
-       par->bus = 0;
-
-       switch ((par->pdev->device >> 4) & 0xff) {
-       case 0x17:
-       case 0x18:
-       case 0x25:
-       case 0x28:
-       case 0x30:
-       case 0x31:
-       case 0x32:
-       case 0x33:
-       case 0x34:
-               par->chan[2].ddc_base   = 0x50;
-               par->bus++;
-               riva_setup_i2c_bus(&par->chan[2], "BUS3");
-       case 0x04:
-       case 0x05:
-       case 0x10:
-       case 0x11:
-       case 0x15:
-       case 0x20:
-               par->chan[1].ddc_base   = 0x36;
-               par->bus++;
-               riva_setup_i2c_bus(&par->chan[1], "BUS2");
-       case 0x03:
-               par->chan[0].ddc_base   = 0x3e;
-               par->bus++;
-               riva_setup_i2c_bus(&par->chan[0], "BUS1");
-       }
+       par->chan[0].ddc_base = 0x3e;
+       par->chan[1].ddc_base = 0x36;
+       par->chan[2].ddc_base = 0x50;
+       riva_setup_i2c_bus(&par->chan[0], "BUS1");
+       riva_setup_i2c_bus(&par->chan[1], "BUS2");
+       riva_setup_i2c_bus(&par->chan[2], "BUS3");
 }
 
 void riva_delete_i2c_busses(struct riva_par *par)
 {
        if (par->chan[0].par)
-               i2c_bit_del_bus(&par->chan[0].adapter);
+               i2c_del_adapter(&par->chan[0].adapter);
        par->chan[0].par = NULL;
 
        if (par->chan[1].par)
-               i2c_bit_del_bus(&par->chan[1].adapter);
+               i2c_del_adapter(&par->chan[1].adapter);
        par->chan[1].par = NULL;
 
-}
-
-static u8 *riva_do_probe_i2c_edid(struct riva_i2c_chan *chan)
-{
-       u8 start = 0x0;
-       struct i2c_msg msgs[] = {
-               {
-                       .addr   = RIVA_DDC,
-                       .len    = 1,
-                       .buf    = &start,
-               }, {
-                       .addr   = RIVA_DDC,
-                       .flags  = I2C_M_RD,
-                       .len    = EDID_LENGTH,
-               },
-       };
-       u8 *buf;
-
-       buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-       if (!buf) {
-               dev_warn(&chan->par->pdev->dev, "Out of memory!\n");
-               return NULL;
-       }
-       msgs[1].buf = buf;
-
-       if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
-               return buf;
-       dev_dbg(&chan->par->pdev->dev, "Unable to read EDID block.\n");
-       kfree(buf);
-       return NULL;
+       if (par->chan[2].par)
+               i2c_del_adapter(&par->chan[2].adapter);
+       par->chan[2].par = NULL;
 }
 
 int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
 {
        u8 *edid = NULL;
-       int i;
 
-       for (i = 0; i < 3; i++) {
-               /* Do the real work */
-               edid = riva_do_probe_i2c_edid(&par->chan[conn-1]);
-               if (edid)
-                       break;
-       }
+       edid = fb_ddc_read(&par->chan[conn-1].adapter);
+
        if (out_edid)
                *out_edid = edid;
        if (!edid)
linux-2.6