Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.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 a8dbc25..9751c37 100644 (file)
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -12,13 +12,13 @@
  * 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>
 
@@ -29,7 +29,7 @@
 
 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 +47,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 +65,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 +80,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 +91,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,7 +105,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.timeout              = 20;
+       chan->algo.timeout              = msecs_to_jiffies(2);
        chan->algo.data                 = chan;
 
        i2c_set_adapdata(&chan->adapter, chan);
@@ -119,31 +118,29 @@ 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;
 
-       switch (par->riva.Architecture) {
-#if 0          /* no support yet for other nVidia chipsets */
-               par->chan[2].ddc_base   = 0x50;
-               riva_setup_i2c_bus(&par->chan[2], "BUS2");
-#endif
-       case NV_ARCH_10:
-       case NV_ARCH_20:
-       case NV_ARCH_04:
-               par->chan[1].ddc_base   = 0x36;
-               riva_setup_i2c_bus(&par->chan[1], "BUS1");
-       case NV_ARCH_03:
-               par->chan[0].ddc_base   = 0x3e;
-               riva_setup_i2c_bus(&par->chan[0], "BUS0");
-       }
+       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)
@@ -156,6 +153,9 @@ void riva_delete_i2c_busses(struct riva_par *par)
                i2c_bit_del_bus(&par->chan[1].adapter);
        par->chan[1].par = NULL;
 
+       if (par->chan[2].par)
+               i2c_bit_del_bus(&par->chan[2].adapter);
+       par->chan[2].par = NULL;
 }
 
 static u8 *riva_do_probe_i2c_edid(struct riva_i2c_chan *chan)
@@ -174,6 +174,9 @@ static u8 *riva_do_probe_i2c_edid(struct riva_i2c_chan *chan)
        };
        u8 *buf;
 
+       if (!chan->par)
+               return NULL;
+
        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
        if (!buf) {
                dev_warn(&chan->par->pdev->dev, "Out of memory!\n");