Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 214 insertions, 0 deletions

diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
new file mode 100644
index 000000000000..da1334dfd51d
--- /dev/null
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -0,0 +1,214 @@
+/*
+ * linux/drivers/video/riva/fbdev-i2c.c - nVidia i2c
+ *
+ * Maintained by Ani Joshi <ajoshi@shell.unixbox.com>
+ *
+ * Copyright 2004 Antonino A. Daplas <adaplas @pol.net>
+ *
+ * Based on radeonfb-i2c.c
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * 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_par         *par = chan->par;
+        u32                     val;
+
+        VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
+        val = VGA_RD08(par->riva.PCIO, 0x3d5) & 0xf0;
+
+        if (state)
+                val |= 0x20;
+        else
+                val &= ~0x20;
+
+        VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
+        VGA_WR08(par->riva.PCIO, 0x3d5, val | 0x1);
+}
+
+static void riva_gpio_setsda(void* data, int state)
+{
+        struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+        struct riva_par         *par = chan->par;
+        u32                     val;
+
+        VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
+        val = VGA_RD08(par->riva.PCIO, 0x3d5) & 0xf0;
+
+        if (state)
+                val |= 0x10;
+        else
+                val &= ~0x10;
+
+        VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base + 1);
+        VGA_WR08(par->riva.PCIO, 0x3d5, val | 0x1);
+}
+
+static int riva_gpio_getscl(void* data)
+{
+        struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+        struct riva_par         *par = chan->par;
+        u32                     val = 0;
+
+        VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base);
+        if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x04)
+                val = 1;
+
+        val = VGA_RD08(par->riva.PCIO, 0x3d5);
+
+        return val;
+}
+
+static int riva_gpio_getsda(void* data)
+{
+        struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+        struct riva_par         *par = chan->par;
+        u32                     val = 0;
+
+        VGA_WR08(par->riva.PCIO, 0x3d4, chan->ddc_base);
+        if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x08)
+                val = 1;
+
+        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.algo_data         = &chan->algo;
+        chan->adapter.dev.parent        = &chan->par->pdev->dev;
+        chan->algo.setsda               = riva_gpio_setsda;
+        chan->algo.setscl               = riva_gpio_setscl;
+        chan->algo.getsda               = riva_gpio_getsda;
+        chan->algo.getscl               = riva_gpio_getscl;
+        chan->algo.udelay               = 40;
+        chan->algo.timeout              = msecs_to_jiffies(2);
+        chan->algo.data                 = chan;
+
+        i2c_set_adapdata(&chan->adapter, chan);
+
+        /* Raise SCL and SDA */
+        riva_gpio_setsda(chan, 1);
+        riva_gpio_setscl(chan, 1);
+        udelay(20);
+
+        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);
+                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->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);
+        par->chan[0].par = NULL;
+
+        if (par->chan[1].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)
+{
+        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;
+
+        if (!chan->par)
+                return NULL;
+
+        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;
+}
+
+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;
+        }
+        if (out_edid)
+                *out_edid = edid;
+        if (!edid)
+                return 1;
+
+        return 0;
+}
+