Commit 45390cf7 authored by Frank Davis's avatar Frank Davis Committed by Linus Torvalds

[PATCH] drivers/media/video/saa7110.c

 Here's the saa7110.c i2c-old --> i2c patch.
parent 7e1b0f75
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/i2c-old.h> #include <linux/i2c.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include "linux/video_decoder.h" #include "linux/video_decoder.h"
...@@ -37,13 +37,31 @@ ...@@ -37,13 +37,31 @@
#define I2C_SAA7110 0x9C /* or 0x9E */ #define I2C_SAA7110 0x9C /* or 0x9E */
#define IF_NAME "saa7110"
#define I2C_DELAY 10 /* 10 us or 100khz */ #define I2C_DELAY 10 /* 10 us or 100khz */
static unsigned short normal_i2c[] = {34>>1, I2C_CLIENT_END };
static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = {
normal_i2c, normal_i2c_range,
probe, probe_range,
ignore, ignore_range,
force
};
static struct i2c_client client_template;
struct saa7110 { struct saa7110 {
struct i2c_bus *bus; struct i2c_client *client;
int addr; int addr;
unsigned char reg[36]; unsigned char reg[36];
struct semaphore lock;
int norm; int norm;
int input; int input;
int enable; int enable;
...@@ -53,68 +71,11 @@ struct saa7110 { ...@@ -53,68 +71,11 @@ struct saa7110 {
int sat; int sat;
}; };
/* ----------------------------------------------------------------------- */
/* I2C support functions */
/* ----------------------------------------------------------------------- */
static
int saa7110_write(struct saa7110 *decoder, unsigned char subaddr, unsigned char data)
{
int ack;
LOCK_I2C_BUS(decoder->bus);
i2c_start(decoder->bus);
i2c_sendbyte(decoder->bus, decoder->addr, I2C_DELAY);
i2c_sendbyte(decoder->bus, subaddr, I2C_DELAY);
ack = i2c_sendbyte(decoder->bus, data, I2C_DELAY);
i2c_stop(decoder->bus);
decoder->reg[subaddr] = data;
UNLOCK_I2C_BUS(decoder->bus);
return ack;
}
static
int saa7110_write_block(struct saa7110* decoder, unsigned const char *data, unsigned int len)
{
unsigned subaddr = *data;
LOCK_I2C_BUS(decoder->bus);
i2c_start(decoder->bus);
i2c_sendbyte(decoder->bus,decoder->addr,I2C_DELAY);
while (len-- > 0) {
if (i2c_sendbyte(decoder->bus,*data,0)) {
i2c_stop(decoder->bus);
UNLOCK_I2C_BUS(decoder->bus);
return -EAGAIN;
}
decoder->reg[subaddr++] = *data++;
}
i2c_stop(decoder->bus);
UNLOCK_I2C_BUS(decoder->bus);
return 0;
}
static
int saa7110_read(struct saa7110* decoder)
{
int data;
LOCK_I2C_BUS(decoder->bus);
i2c_start(decoder->bus);
i2c_sendbyte(decoder->bus, decoder->addr, I2C_DELAY);
i2c_start(decoder->bus);
i2c_sendbyte(decoder->bus, decoder->addr | 1, I2C_DELAY);
data = i2c_readbyte(decoder->bus, 1);
i2c_stop(decoder->bus);
UNLOCK_I2C_BUS(decoder->bus);
return data;
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* SAA7110 functions */ /* SAA7110 functions */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static static
int saa7110_selmux(struct i2c_device *device, int chan) int saa7110_selmux(struct i2c_client *client, int chan)
{ {
static const unsigned char modes[9][8] = { static const unsigned char modes[9][8] = {
/* mode 0 */ { 0x00, 0xD9, 0x17, 0x40, 0x03, 0x44, 0x75, 0x16 }, /* mode 0 */ { 0x00, 0xD9, 0x17, 0x40, 0x03, 0x44, 0x75, 0x16 },
...@@ -126,61 +87,59 @@ static const unsigned char modes[9][8] = { ...@@ -126,61 +87,59 @@ static const unsigned char modes[9][8] = {
/* mode 6 */ { 0x80, 0x59, 0x17, 0x42, 0xA3, 0x44, 0x75, 0x12 }, /* mode 6 */ { 0x80, 0x59, 0x17, 0x42, 0xA3, 0x44, 0x75, 0x12 },
/* mode 7 */ { 0x80, 0x9A, 0x17, 0xB1, 0x13, 0x60, 0xB5, 0x14 }, /* mode 7 */ { 0x80, 0x9A, 0x17, 0xB1, 0x13, 0x60, 0xB5, 0x14 },
/* mode 8 */ { 0x80, 0x3C, 0x27, 0xC1, 0x23, 0x44, 0x75, 0x21 } }; /* mode 8 */ { 0x80, 0x3C, 0x27, 0xC1, 0x23, 0x44, 0x75, 0x21 } };
struct saa7110* decoder = device->data;
const unsigned char* ptr = modes[chan]; const unsigned char* ptr = modes[chan];
saa7110_write(decoder,0x06,ptr[0]); /* Luminance control */ i2c_smbus_write_byte_data(client,0x06,ptr[0]); /* Luminance control */
saa7110_write(decoder,0x20,ptr[1]); /* Analog Control #1 */ i2c_smbus_write_byte_data(client,0x20,ptr[1]); /* Analog Control #1 */
saa7110_write(decoder,0x21,ptr[2]); /* Analog Control #2 */ i2c_smbus_write_byte_data(client,0x21,ptr[2]); /* Analog Control #2 */
saa7110_write(decoder,0x22,ptr[3]); /* Mixer Control #1 */ i2c_smbus_write_byte_data(client,0x22,ptr[3]); /* Mixer Control #1 */
saa7110_write(decoder,0x2C,ptr[4]); /* Mixer Control #2 */ i2c_smbus_write_byte_data(client,0x2C,ptr[4]); /* Mixer Control #2 */
saa7110_write(decoder,0x30,ptr[5]); /* ADCs gain control */ i2c_smbus_write_byte_data(client,0x30,ptr[5]); /* ADCs gain control */
saa7110_write(decoder,0x31,ptr[6]); /* Mixer Control #3 */ i2c_smbus_write_byte_data(client,0x31,ptr[6]); /* Mixer Control #3 */
saa7110_write(decoder,0x21,ptr[7]); /* Analog Control #2 */ i2c_smbus_write_byte_data(client,0x21,ptr[7]); /* Analog Control #2 */
return 0; return 0;
} }
static static
int determine_norm(struct i2c_device* dev) int determine_norm(struct i2c_client* client)
{ {
struct saa7110* decoder = dev->data;
int status; int status;
/* mode changed, start automatic detection */ /* mode changed, start automatic detection */
status = saa7110_read(decoder); status = i2c_smbus_read_byte(client);
if ((status & 3) == 0) { if ((status & 3) == 0) {
saa7110_write(decoder,0x06,0x80); i2c_smbus_write_byte_data(client,0x06,0x80);
if (status & 0x20) { if (status & 0x20) {
DEBUG(printk(KERN_INFO "%s: norm=bw60\n",dev->name)); DEBUG(printk(KERN_INFO "%s: norm=bw60\n",adp->name));
saa7110_write(decoder,0x2E,0x81); i2c_smbus_write_byte_data(client,0x2E,0x81);
return VIDEO_MODE_NTSC; return VIDEO_MODE_NTSC;
} }
DEBUG(printk(KERN_INFO "%s: norm=bw50\n",dev->name)); DEBUG(printk(KERN_INFO "%s: norm=bw50\n",adp->name));
saa7110_write(decoder,0x2E,0x9A); i2c_smbus_write_byte_data(client,0x2E,0x9A);
return VIDEO_MODE_PAL; return VIDEO_MODE_PAL;
} }
saa7110_write(decoder,0x06,0x00); i2c_smbus_write_byte_data(client,0x06,0x00);
if (status & 0x20) { /* 60Hz */ if (status & 0x20) { /* 60Hz */
DEBUG(printk(KERN_INFO "%s: norm=ntsc\n",dev->name)); DEBUG(printk(KERN_INFO "%s: norm=ntsc\n",adp->name));
saa7110_write(decoder,0x0D,0x06); i2c_smbus_write_byte_data(client,0x0D,0x06);
saa7110_write(decoder,0x11,0x2C); i2c_smbus_write_byte_data(client,0x11,0x2C);
saa7110_write(decoder,0x2E,0x81); i2c_smbus_write_byte_data(client,0x2E,0x81);
return VIDEO_MODE_NTSC; return VIDEO_MODE_NTSC;
} }
/* 50Hz -> PAL/SECAM */ /* 50Hz -> PAL/SECAM */
saa7110_write(decoder,0x0D,0x06); i2c_smbus_write_byte_data(client,0x0D,0x06);
saa7110_write(decoder,0x11,0x59); i2c_smbus_write_byte_data(client,0x11,0x59);
saa7110_write(decoder,0x2E,0x9A); i2c_smbus_write_byte_data(client,0x2E,0x9A);
mdelay(150); /* pause 150 ms */ mdelay(150); /* pause 150 ms */
status = saa7110_read(decoder); status = i2c_smbus_read_byte(client);
if ((status & 0x03) == 0x01) { if ((status & 0x03) == 0x01) {
DEBUG(printk(KERN_INFO "%s: norm=secam\n",dev->name)); DEBUG(printk(KERN_INFO "%s: norm=secam\n",dev->name));
saa7110_write(decoder,0x0D,0x07); i2c_smbus_write_byte_data(client,0x0D,0x07);
return VIDEO_MODE_SECAM; return VIDEO_MODE_SECAM;
} }
DEBUG(printk(KERN_INFO "%s: norm=pal\n",dev->name)); DEBUG(printk(KERN_INFO "%s: norm=pal\n",dev->name));
...@@ -188,7 +147,7 @@ int determine_norm(struct i2c_device* dev) ...@@ -188,7 +147,7 @@ int determine_norm(struct i2c_device* dev)
} }
static static
int saa7110_attach(struct i2c_device *device) int saa7110_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
{ {
static const unsigned char initseq[] = { static const unsigned char initseq[] = {
0, 0x4C, 0x3C, 0x0D, 0xEF, 0xBD, 0xF0, 0x00, 0x00, 0, 0x4C, 0x3C, 0x0D, 0xEF, 0xBD, 0xF0, 0x00, 0x00,
...@@ -198,20 +157,28 @@ static const unsigned char initseq[] = { ...@@ -198,20 +157,28 @@ static const unsigned char initseq[] = {
0xD9, 0x17, 0x40, 0x41, 0x80, 0x41, 0x80, 0x4F, 0xD9, 0x17, 0x40, 0x41, 0x80, 0x41, 0x80, 0x4F,
0xFE, 0x01, 0xCF, 0x0F, 0x03, 0x01, 0x81, 0x03, 0xFE, 0x01, 0xCF, 0x0F, 0x03, 0x01, 0x81, 0x03,
0x40, 0x75, 0x01, 0x8C, 0x03}; 0x40, 0x75, 0x01, 0x8C, 0x03};
struct saa7110* decoder; struct saa7110 *decoder;
struct i2c_client *client;
int rv; int rv;
client=kmalloc(sizeof(*client), GFP_KERNEL);
device->data = decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL); if(client == NULL)
if (device->data == 0)
return -ENOMEM; return -ENOMEM;
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
MOD_INC_USE_COUNT; decoder = kmalloc(sizeof(*decoder), GFP_KERNEL);
if (decoder == NULL) {
kfree(client);
return -ENOMEM;
}
/* clear our private data */ /* clear our private data */
memset(decoder, 0, sizeof(struct saa7110)); memset(decoder, 0, sizeof(*decoder));
strcpy(device->name, "saa7110"); strcpy(client->name, IF_NAME);
decoder->bus = device->bus; decoder->client = client;
decoder->addr = device->addr; client->data = decoder;
decoder->addr = addr;
decoder->norm = VIDEO_MODE_PAL; decoder->norm = VIDEO_MODE_PAL;
decoder->input = 0; decoder->input = 0;
decoder->enable = 1; decoder->enable = 1;
...@@ -220,40 +187,52 @@ static const unsigned char initseq[] = { ...@@ -220,40 +187,52 @@ static const unsigned char initseq[] = {
decoder->hue = 32768; decoder->hue = 32768;
decoder->sat = 32768; decoder->sat = 32768;
rv = saa7110_write_block(decoder, initseq, sizeof(initseq)); rv = i2c_master_send(client, initseq, sizeof(initseq));
if (rv < 0) if (rv < 0)
printk(KERN_ERR "%s_attach: init status %d\n", device->name, rv); printk(KERN_ERR "%s_attach: init status %d\n", client->name, rv);
else { else {
saa7110_write(decoder,0x21,0x16); i2c_smbus_write_byte_data(client,0x21,0x16);
saa7110_write(decoder,0x0D,0x04); i2c_smbus_write_byte_data(client,0x0D,0x04);
DEBUG(printk(KERN_INFO "%s_attach: chip version %x\n", device->name, saa7110_read(decoder))); DEBUG(printk(KERN_INFO "%s_attach: chip version %x\n", client->name, i2c_smbus_read_byte(client)));
saa7110_write(decoder,0x0D,0x06); i2c_smbus_write_byte_data(client,0x0D,0x06);
} }
init_MUTEX(&decoder->lock);
i2c_attach_client(client);
MOD_INC_USE_COUNT;
/* setup and implicit mode 0 select has been performed */ /* setup and implicit mode 0 select has been performed */
return 0; return 0;
} }
static
int saa7110_probe(struct i2c_adapter *adap)
{
return i2c_probe(adap, &addr_data, saa7110_attach);
}
static static
int saa7110_detach(struct i2c_device *device) int saa7110_detach(struct i2c_client *client)
{ {
struct saa7110* decoder = device->data; struct saa7110* decoder = client->data;
DEBUG(printk(KERN_INFO "%s_detach\n",device->name)); i2c_detach_client(client);
DEBUG(printk(KERN_INFO "%s_detach\n",client->name));
/* stop further output */ /* stop further output */
saa7110_write(decoder,0x0E,0x00); i2c_smbus_write_byte_data(client,0x0E,0x00);
kfree(device->data); kfree(decoder);
kfree(client);
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
return 0; return 0;
} }
static static
int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) int saa7110_command(struct i2c_client *client, unsigned int cmd, void *arg)
{ {
struct saa7110* decoder = device->data; struct saa7110* decoder = client->data;
int v; int v;
switch (cmd) { switch (cmd) {
...@@ -272,11 +251,11 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -272,11 +251,11 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
case DECODER_GET_STATUS: case DECODER_GET_STATUS:
{ {
struct saa7110* decoder = device->data; struct saa7110* decoder = client->data;
int status; int status;
int res = 0; int res = 0;
status = i2c_read(device->bus,device->addr|1); status = i2c_smbus_read_byte(client);
if (status & 0x40) if (status & 0x40)
res |= DECODER_STATUS_GOOD; res |= DECODER_STATUS_GOOD;
if (status & 0x03) if (status & 0x03)
...@@ -301,26 +280,26 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -301,26 +280,26 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
v = *(int*)arg; v = *(int*)arg;
if (decoder->norm != v) { if (decoder->norm != v) {
decoder->norm = v; decoder->norm = v;
saa7110_write(decoder, 0x06, 0x00); i2c_smbus_write_byte_data(client, 0x06, 0x00);
switch (v) { switch (v) {
case VIDEO_MODE_NTSC: case VIDEO_MODE_NTSC:
saa7110_write(decoder, 0x0D, 0x06); i2c_smbus_write_byte_data(client, 0x0D, 0x06);
saa7110_write(decoder, 0x11, 0x2C); i2c_smbus_write_byte_data(client, 0x11, 0x2C);
saa7110_write(decoder, 0x30, 0x81); i2c_smbus_write_byte_data(client, 0x30, 0x81);
saa7110_write(decoder, 0x2A, 0xDF); i2c_smbus_write_byte_data(client, 0x2A, 0xDF);
break; break;
case VIDEO_MODE_PAL: case VIDEO_MODE_PAL:
saa7110_write(decoder, 0x0D, 0x06); i2c_smbus_write_byte_data(client, 0x0D, 0x06);
saa7110_write(decoder, 0x11, 0x59); i2c_smbus_write_byte_data(client, 0x11, 0x59);
saa7110_write(decoder, 0x2E, 0x9A); i2c_smbus_write_byte_data(client, 0x2E, 0x9A);
break; break;
case VIDEO_MODE_SECAM: case VIDEO_MODE_SECAM:
saa7110_write(decoder, 0x0D, 0x07); i2c_smbus_write_byte_data(client, 0x0D, 0x07);
saa7110_write(decoder, 0x11, 0x59); i2c_smbus_write_byte_data(client, 0x11, 0x59);
saa7110_write(decoder, 0x2E, 0x9A); i2c_smbus_write_byte_data(client, 0x2E, 0x9A);
break; break;
case VIDEO_MODE_AUTO: case VIDEO_MODE_AUTO:
*(int*)arg = determine_norm(device); *(int*)arg = determine_norm(client);
break; break;
default: default:
return -EPERM; return -EPERM;
...@@ -334,7 +313,7 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -334,7 +313,7 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
return -EINVAL; return -EINVAL;
if (decoder->input != v) { if (decoder->input != v) {
decoder->input = v; decoder->input = v;
saa7110_selmux(device, v); saa7110_selmux(client, v);
} }
break; break;
...@@ -349,7 +328,7 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -349,7 +328,7 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
v = *(int*)arg; v = *(int*)arg;
if (decoder->enable != v) { if (decoder->enable != v) {
decoder->enable = v; decoder->enable = v;
saa7110_write(decoder,0x0E, v ? 0x18 : 0x00); i2c_smbus_write_byte_data(client,0x0E, v ? 0x18 : 0x00);
} }
break; break;
...@@ -360,22 +339,22 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -360,22 +339,22 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
if (decoder->bright != pic->brightness) { if (decoder->bright != pic->brightness) {
/* We want 0 to 255 we get 0-65535 */ /* We want 0 to 255 we get 0-65535 */
decoder->bright = pic->brightness; decoder->bright = pic->brightness;
saa7110_write(decoder, 0x19, decoder->bright >> 8); i2c_smbus_write_byte_data(client, 0x19, decoder->bright >> 8);
} }
if (decoder->contrast != pic->contrast) { if (decoder->contrast != pic->contrast) {
/* We want 0 to 127 we get 0-65535 */ /* We want 0 to 127 we get 0-65535 */
decoder->contrast = pic->contrast; decoder->contrast = pic->contrast;
saa7110_write(decoder, 0x13, decoder->contrast >> 9); i2c_smbus_write_byte_data(client, 0x13, decoder->contrast >> 9);
} }
if (decoder->sat != pic->colour) { if (decoder->sat != pic->colour) {
/* We want 0 to 127 we get 0-65535 */ /* We want 0 to 127 we get 0-65535 */
decoder->sat = pic->colour; decoder->sat = pic->colour;
saa7110_write(decoder, 0x12, decoder->sat >> 9); i2c_smbus_write_byte_data(client, 0x12, decoder->sat >> 9);
} }
if (decoder->hue != pic->hue) { if (decoder->hue != pic->hue) {
/* We want -128 to 127 we get 0-65535 */ /* We want -128 to 127 we get 0-65535 */
decoder->hue = pic->hue; decoder->hue = pic->hue;
saa7110_write(decoder, 0x07, (decoder->hue>>8)-128); i2c_smbus_write_byte_data(client, 0x07, (decoder->hue>>8)-128);
} }
} }
break; break;
...@@ -383,7 +362,7 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -383,7 +362,7 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
case DECODER_DUMP: case DECODER_DUMP:
for (v=0; v<34; v+=16) { for (v=0; v<34; v+=16) {
int j; int j;
DEBUG(printk(KERN_INFO "%s: %03x\n",device->name,v)); DEBUG(printk(KERN_INFO "%s: %03x\n",client->name,v));
for (j=0; j<16; j++) { for (j=0; j<16; j++) {
DEBUG(printk(KERN_INFO " %02x",decoder->reg[v+j])); DEBUG(printk(KERN_INFO " %02x",decoder->reg[v+j]));
} }
...@@ -402,24 +381,30 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg) ...@@ -402,24 +381,30 @@ int saa7110_command(struct i2c_device *device, unsigned int cmd, void *arg)
static struct i2c_driver i2c_driver_saa7110 = static struct i2c_driver i2c_driver_saa7110 =
{ {
"saa7110", /* name */ IF_NAME, /* name */
I2C_DRIVERID_SAA7110, /* in i2c.h */
I2C_DRIVERID_VIDEODECODER, /* in i2c.h */ I2C_DF_NOTIFY, /* Addr range */
I2C_SAA7110, I2C_SAA7110+1, /* Addr range */ saa7110_probe,
saa7110_attach,
saa7110_detach, saa7110_detach,
saa7110_command saa7110_command
}; };
static struct i2c_client client_template = {
"saa7110_client",
-1,
0,
0,
NULL,
&i2c_driver_saa7110
};
static int saa7110_init(void) static int saa7110_init(void)
{ {
return i2c_register_driver(&i2c_driver_saa7110); return i2c_add_driver(&i2c_driver_saa7110);
} }
static void saa7110_exit(void) static void saa7110_exit(void)
{ {
i2c_unregister_driver(&i2c_driver_saa7110); i2c_del_driver(&i2c_driver_saa7110);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment