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, 335 insertions, 0 deletions

diff --git a/drivers/media/video/ovcamchip/ov7x10.c b/drivers/media/video/ovcamchip/ov7x10.c
new file mode 100644
index 000000000000..6c383d4b14fa
--- /dev/null
+++ b/drivers/media/video/ovcamchip/ov7x10.c
@@ -0,0 +1,335 @@
+/* OmniVision OV7610/OV7110 Camera Chip Support Code
+ *
+ * Copyright (c) 1999-2004 Mark McClelland <mark@alpha.dyndns.org>
+ * http://alpha.dyndns.org/ov511/
+ *
+ * Color fixes by by Orion Sky Lawlor <olawlor@acm.org> (2/26/2000)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. NO WARRANTY OF ANY KIND is expressed or implied.
+ */
+
+#define DEBUG
+
+#include <linux/slab.h>
+#include "ovcamchip_priv.h"
+
+/* Registers */
+#define REG_GAIN                0x00    /* gain [5:0] */
+#define REG_BLUE                0x01    /* blue channel balance */
+#define REG_RED                 0x02    /* red channel balance */
+#define REG_SAT                 0x03    /* saturation */
+#define REG_CNT                 0x05    /* Y contrast */
+#define REG_BRT                 0x06    /* Y brightness */
+#define REG_BLUE_BIAS           0x0C    /* blue channel bias [5:0] */
+#define REG_RED_BIAS            0x0D    /* red channel bias [5:0] */
+#define REG_GAMMA_COEFF         0x0E    /* gamma settings */
+#define REG_WB_RANGE            0x0F    /* AEC/ALC/S-AWB settings */
+#define REG_EXP                 0x10    /* manual exposure setting */
+#define REG_CLOCK               0x11    /* polarity/clock prescaler */
+#define REG_FIELD_DIVIDE        0x16    /* field interval/mode settings */
+#define REG_HWIN_START          0x17    /* horizontal window start */
+#define REG_HWIN_END            0x18    /* horizontal window end */
+#define REG_VWIN_START          0x19    /* vertical window start */
+#define REG_VWIN_END            0x1A    /* vertical window end */
+#define REG_PIXEL_SHIFT         0x1B    /* pixel shift */
+#define REG_YOFFSET             0x21    /* Y channel offset */
+#define REG_UOFFSET             0x22    /* U channel offset */
+#define REG_ECW                 0x24    /* exposure white level for AEC */
+#define REG_ECB                 0x25    /* exposure black level for AEC */
+#define REG_FRAMERATE_H         0x2A    /* frame rate MSB + misc */
+#define REG_FRAMERATE_L         0x2B    /* frame rate LSB */
+#define REG_ALC                 0x2C    /* Auto Level Control settings */
+#define REG_VOFFSET             0x2E    /* V channel offset adjustment */
+#define REG_ARRAY_BIAS          0x2F    /* array bias -- don't change */
+#define REG_YGAMMA              0x33    /* misc gamma settings [7:6] */
+#define REG_BIAS_ADJUST         0x34    /* misc bias settings */
+
+/* Window parameters */
+#define HWSBASE 0x38
+#define HWEBASE 0x3a
+#define VWSBASE 0x05
+#define VWEBASE 0x05
+
+struct ov7x10 {
+        int auto_brt;
+        int auto_exp;
+        int bandfilt;
+        int mirror;
+};
+
+/* Lawrence Glaister <lg@jfm.bc.ca> reports:
+ *
+ * Register 0x0f in the 7610 has the following effects:
+ *
+ * 0x85 (AEC method 1): Best overall, good contrast range
+ * 0x45 (AEC method 2): Very overexposed
+ * 0xa5 (spec sheet default): Ok, but the black level is
+ *      shifted resulting in loss of contrast
+ * 0x05 (old driver setting): very overexposed, too much
+ *      contrast
+ */
+static struct ovcamchip_regvals regvals_init_7x10[] = {
+        { 0x10, 0xff },
+        { 0x16, 0x03 },
+        { 0x28, 0x24 },
+        { 0x2b, 0xac },
+        { 0x12, 0x00 },
+        { 0x38, 0x81 },
+        { 0x28, 0x24 }, /* 0c */
+        { 0x0f, 0x85 }, /* lg's setting */
+        { 0x15, 0x01 },
+        { 0x20, 0x1c },
+        { 0x23, 0x2a },
+        { 0x24, 0x10 },
+        { 0x25, 0x8a },
+        { 0x26, 0xa2 },
+        { 0x27, 0xc2 },
+        { 0x2a, 0x04 },
+        { 0x2c, 0xfe },
+        { 0x2d, 0x93 },
+        { 0x30, 0x71 },
+        { 0x31, 0x60 },
+        { 0x32, 0x26 },
+        { 0x33, 0x20 },
+        { 0x34, 0x48 },
+        { 0x12, 0x24 },
+        { 0x11, 0x01 },
+        { 0x0c, 0x24 },
+        { 0x0d, 0x24 },
+        { 0xff, 0xff }, /* END MARKER */
+};
+
+/* This initializes the OV7x10 camera chip and relevant variables. */
+static int ov7x10_init(struct i2c_client *c)
+{
+        struct ovcamchip *ov = i2c_get_clientdata(c);
+        struct ov7x10 *s;
+        int rc;
+
+        DDEBUG(4, &c->dev, "entered");
+
+        rc = ov_write_regvals(c, regvals_init_7x10);
+        if (rc < 0)
+                return rc;
+
+        ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
+        if (!s)
+                return -ENOMEM;
+        memset(s, 0, sizeof *s);
+
+        s->auto_brt = 1;
+        s->auto_exp = 1;
+
+        return rc;
+}
+
+static int ov7x10_free(struct i2c_client *c)
+{
+        struct ovcamchip *ov = i2c_get_clientdata(c);
+
+        kfree(ov->spriv);
+        return 0;
+}
+
+static int ov7x10_set_control(struct i2c_client *c,
+                              struct ovcamchip_control *ctl)
+{
+        struct ovcamchip *ov = i2c_get_clientdata(c);
+        struct ov7x10 *s = ov->spriv;
+        int rc;
+        int v = ctl->value;
+
+        switch (ctl->id) {
+        case OVCAMCHIP_CID_CONT:
+                rc = ov_write(c, REG_CNT, v >> 8);
+                break;
+        case OVCAMCHIP_CID_BRIGHT:
+                rc = ov_write(c, REG_BRT, v >> 8);
+                break;
+        case OVCAMCHIP_CID_SAT:
+                rc = ov_write(c, REG_SAT, v >> 8);
+                break;
+        case OVCAMCHIP_CID_HUE:
+                rc = ov_write(c, REG_RED, 0xFF - (v >> 8));
+                if (rc < 0)
+                        goto out;
+
+                rc = ov_write(c, REG_BLUE, v >> 8);
+                break;
+        case OVCAMCHIP_CID_EXP:
+                rc = ov_write(c, REG_EXP, v);
+                break;
+        case OVCAMCHIP_CID_FREQ:
+        {
+                int sixty = (v == 60);
+
+                rc = ov_write_mask(c, 0x2a, sixty?0x00:0x80, 0x80);
+                if (rc < 0)
+                        goto out;
+
+                rc = ov_write(c, 0x2b, sixty?0x00:0xac);
+                if (rc < 0)
+                        goto out;
+
+                rc = ov_write_mask(c, 0x13, 0x10, 0x10);
+                if (rc < 0)
+                        goto out;
+
+                rc = ov_write_mask(c, 0x13, 0x00, 0x10);
+                break;
+        }
+        case OVCAMCHIP_CID_BANDFILT:
+                rc = ov_write_mask(c, 0x2d, v?0x04:0x00, 0x04);
+                s->bandfilt = v;
+                break;
+        case OVCAMCHIP_CID_AUTOBRIGHT:
+                rc = ov_write_mask(c, 0x2d, v?0x10:0x00, 0x10);
+                s->auto_brt = v;
+                break;
+        case OVCAMCHIP_CID_AUTOEXP:
+                rc = ov_write_mask(c, 0x29, v?0x00:0x80, 0x80);
+                s->auto_exp = v;
+                break;
+        case OVCAMCHIP_CID_MIRROR:
+                rc = ov_write_mask(c, 0x12, v?0x40:0x00, 0x40);
+                s->mirror = v;
+                break;
+        default:
+                DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
+                return -EPERM;
+        }
+
+out:
+        DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, v, rc);
+        return rc;
+}
+
+static int ov7x10_get_control(struct i2c_client *c,
+                              struct ovcamchip_control *ctl)
+{
+        struct ovcamchip *ov = i2c_get_clientdata(c);
+        struct ov7x10 *s = ov->spriv;
+        int rc = 0;
+        unsigned char val = 0;
+
+        switch (ctl->id) {
+        case OVCAMCHIP_CID_CONT:
+                rc = ov_read(c, REG_CNT, &val);
+                ctl->value = val << 8;
+                break;
+        case OVCAMCHIP_CID_BRIGHT:
+                rc = ov_read(c, REG_BRT, &val);
+                ctl->value = val << 8;
+                break;
+        case OVCAMCHIP_CID_SAT:
+                rc = ov_read(c, REG_SAT, &val);
+                ctl->value = val << 8;
+                break;
+        case OVCAMCHIP_CID_HUE:
+                rc = ov_read(c, REG_BLUE, &val);
+                ctl->value = val << 8;
+                break;
+        case OVCAMCHIP_CID_EXP:
+                rc = ov_read(c, REG_EXP, &val);
+                ctl->value = val;
+                break;
+        case OVCAMCHIP_CID_BANDFILT:
+                ctl->value = s->bandfilt;
+                break;
+        case OVCAMCHIP_CID_AUTOBRIGHT:
+                ctl->value = s->auto_brt;
+                break;
+        case OVCAMCHIP_CID_AUTOEXP:
+                ctl->value = s->auto_exp;
+                break;
+        case OVCAMCHIP_CID_MIRROR:
+                ctl->value = s->mirror;
+                break;
+        default:
+                DDEBUG(2, &c->dev, "control not supported: %d", ctl->id);
+                return -EPERM;
+        }
+
+        DDEBUG(3, &c->dev, "id=%d, arg=%d, rc=%d", ctl->id, ctl->value, rc);
+        return rc;
+}
+
+static int ov7x10_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
+{
+        int qvga = win->quarter;
+
+        /******** QVGA-specific regs ********/
+
+        ov_write(c, 0x14, qvga?0x24:0x04);
+
+        /******** Palette-specific regs ********/
+
+        if (win->format == VIDEO_PALETTE_GREY) {
+                ov_write_mask(c, 0x0e, 0x40, 0x40);
+                ov_write_mask(c, 0x13, 0x20, 0x20);
+        } else {
+                ov_write_mask(c, 0x0e, 0x00, 0x40);
+                ov_write_mask(c, 0x13, 0x00, 0x20);
+        }
+
+        /******** Clock programming ********/
+
+        ov_write(c, 0x11, win->clockdiv);
+
+        /******** Resolution-specific ********/
+
+        if (win->width == 640 && win->height == 480)
+                ov_write(c, 0x35, 0x9e);
+        else
+                ov_write(c, 0x35, 0x1e);
+
+        return 0;
+}
+
+static int ov7x10_set_window(struct i2c_client *c, struct ovcamchip_window *win)
+{
+        int ret, hwscale, vwscale;
+
+        ret = ov7x10_mode_init(c, win);
+        if (ret < 0)
+                return ret;
+
+        if (win->quarter) {
+                hwscale = 1;
+                vwscale = 0;
+        } else {
+                hwscale = 2;
+                vwscale = 1;
+        }
+
+        ov_write(c, 0x17, HWSBASE + (win->x >> hwscale));
+        ov_write(c, 0x18, HWEBASE + ((win->x + win->width) >> hwscale));
+        ov_write(c, 0x19, VWSBASE + (win->y >> vwscale));
+        ov_write(c, 0x1a, VWEBASE + ((win->y + win->height) >> vwscale));
+
+        return 0;
+}
+
+static int ov7x10_command(struct i2c_client *c, unsigned int cmd, void *arg)
+{
+        switch (cmd) {
+        case OVCAMCHIP_CMD_S_CTRL:
+                return ov7x10_set_control(c, arg);
+        case OVCAMCHIP_CMD_G_CTRL:
+                return ov7x10_get_control(c, arg);
+        case OVCAMCHIP_CMD_S_MODE:
+                return ov7x10_set_window(c, arg);
+        default:
+                DDEBUG(2, &c->dev, "command not supported: %d", cmd);
+                return -ENOIOCTLCMD;
+        }
+}
+
+struct ovcamchip_ops ov7x10_ops = {
+        .init    =      ov7x10_init,
+        .free    =      ov7x10_free,
+        .command =      ov7x10_command,
+};