Skip to content

L
linux
Commit 4a142aba authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] update adv7175 to new i2c bus code

parent 855fa512
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 177 deletions
drivers/media/video/adv7175.c
View file @ 4a142aba
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/i2c-old.h> #include <linux/i2c.h>
#include <linux/video_encoder.h> #include <linux/video_encoder.h>
...@@ -55,28 +55,15 @@ ...@@ -55,28 +55,15 @@
#define DEBUG(x...) #define DEBUG(x...)
#endif #endif
/* ----------------------------------------------------------------------- */ #define I2C_ADV7175 0xd4
#define I2C_ADV7176 0x54
struct adv7175 {
struct i2c_bus *bus;
int addr;
unsigned char reg[128];
int norm;
int input;
int enable;
int bright;
int contrast;
int hue;
int sat;
};
#define I2C_ADV7175 0xd4 #define IF_NAME "adv7175"
#define I2C_ADV7176 0x54
static char adv7175_name[] = "adv7175"; static char adv7175_name[] = "adv7175";
static char adv7176_name[] = "adv7176"; static char adv7176_name[] = "adv7176";
static char unknown_name[] = "UNKNOWN"; static char unknown_name[] = "UNKNOWN";
char *dname;
#if (DEBUGLEVEL > 0) #if (DEBUGLEVEL > 0)
static char *inputs[] = { "pass_through", "play_back", "color_bar" }; static char *inputs[] = { "pass_through", "play_back", "color_bar" };
...@@ -85,64 +72,34 @@ static char *norms[] = { "PAL", "NTSC", "SECAM->PAL (may not work!)" }; ...@@ -85,64 +72,34 @@ static char *norms[] = { "PAL", "NTSC", "SECAM->PAL (may not work!)" };
#define I2C_DELAY 10 #define I2C_DELAY 10
/* ----------------------------------------------------------------------- */ static unsigned short normal_i2c[] = {I2C_ADV7175, I2C_CLIENT_END};
static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
static int adv7175_write(struct adv7175 *dev, unsigned char subaddr, unsigned char data) static unsigned short probe[2] = {I2C_CLIENT_END, I2C_CLIENT_END};
{ static unsigned short probe_range[2] = {I2C_CLIENT_END, I2C_CLIENT_END};
int ack; static unsigned short ignore[2] = {I2C_CLIENT_END, I2C_CLIENT_END};
static unsigned short ignore_range[2] = {I2C_CLIENT_END, I2C_CLIENT_END};
LOCK_I2C_BUS(dev->bus); static unsigned short force[2] = {I2C_CLIENT_END, I2C_CLIENT_END};
i2c_start(dev->bus); static struct i2c_client_address_data addr_data = {
i2c_sendbyte(dev->bus, dev->addr, I2C_DELAY); normal_i2c, normal_i2c_range,
i2c_sendbyte(dev->bus, subaddr, I2C_DELAY); probe, probe_range,
ack = i2c_sendbyte(dev->bus, data, I2C_DELAY); ignore, ignore_range,
dev->reg[subaddr] = data; force};
i2c_stop(dev->bus); static struct i2c_client client_template;
UNLOCK_I2C_BUS(dev->bus);
return ack;
}
static unsigned char adv7175_read(struct adv7175 *dev, unsigned char subaddr)
{
unsigned char data;
LOCK_I2C_BUS(dev->bus);
i2c_start(dev->bus);
i2c_sendbyte(dev->bus, dev->addr, I2C_DELAY);
i2c_sendbyte(dev->bus, subaddr, I2C_DELAY);
i2c_sendbyte(dev->bus, dev->addr + 1, I2C_DELAY);
data = i2c_readbyte(dev->bus, 1);
dev->reg[subaddr] = data;
i2c_stop(dev->bus);
UNLOCK_I2C_BUS(dev->bus);
return data;
}
static int adv7175_write_block(struct adv7175 *dev, struct adv7175 {
unsigned const char *data, unsigned int len) struct i2c_client *client;
{ int addr;
int ack = 0; unsigned char reg[128];
unsigned subaddr; struct semaphore lock;
int norm;
while (len > 1) { int input;
LOCK_I2C_BUS(dev->bus); int enable;
i2c_start(dev->bus); int bright;
i2c_sendbyte(dev->bus, dev->addr, I2C_DELAY); int contrast;
ack = i2c_sendbyte(dev->bus, (subaddr = *data++), I2C_DELAY); int hue;
ack = i2c_sendbyte(dev->bus, (dev->reg[subaddr] = *data++), I2C_DELAY); int sat;
len -= 2; };
while (len > 1 && *data == ++subaddr) {
data++;
ack = i2c_sendbyte(dev->bus, (dev->reg[subaddr] = *data++), I2C_DELAY);
len -= 2;
}
i2c_stop(dev->bus);
UNLOCK_I2C_BUS(dev->bus);
}
return ack;
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
// Output filter: S-Video Composite // Output filter: S-Video Composite
...@@ -203,65 +160,87 @@ static const unsigned char init_ntsc[] = { ...@@ -203,65 +160,87 @@ static const unsigned char init_ntsc[] = {
0x06, 0x1a, /* subc. phase */ 0x06, 0x1a, /* subc. phase */
}; };
static int adv7175_attach(struct i2c_device *device) static int adv717x_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
{ {
int i;
struct adv7175 *encoder; struct adv7175 *encoder;
char *dname; struct i2c_client *client;
int rv, i, x_common=39; /* x is number entries init_common - 1 */
MOD_INC_USE_COUNT; printk(KERN_INFO "adv717x: video chip found.\n");
client=kmalloc(sizeof(*client), GFP_KERNEL);
if(client == NULL)
return -ENOMEM;
device->data = encoder = kmalloc(sizeof(struct adv7175), GFP_KERNEL); client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
encoder = kmalloc(sizeof(*encoder), GFP_KERNEL);
if (encoder == NULL) { if (encoder == NULL) {
MOD_DEC_USE_COUNT; kfree(client);
return -ENOMEM; return -ENOMEM;
} }
memset(encoder, 0, sizeof(*encoder));
memset(encoder, 0, sizeof(struct adv7175)); if ((encoder->addr == I2C_ADV7175) || (encoder->addr == (I2C_ADV7175 + 2))) {
if ((device->addr == I2C_ADV7175) || (device->addr == (I2C_ADV7175 + 2))) {
dname = adv7175_name; dname = adv7175_name;
} else if ((device->addr == I2C_ADV7176) || (device->addr == (I2C_ADV7176 + 2))) { } else if ((encoder->addr == I2C_ADV7176) || (encoder->addr == (I2C_ADV7176 + 2))) {
dname = adv7176_name; dname = adv7176_name;
} else { } else {
// We should never get here!!! // We should never get here!!!
dname = unknown_name; dname = unknown_name;
} }
strcpy(device->name, dname); strcpy(client->name, dname);
encoder->bus = device->bus; init_MUTEX(&encoder->lock);
encoder->addr = device->addr; encoder->client = client;
encoder->addr = addr;
encoder->norm = VIDEO_MODE_PAL; encoder->norm = VIDEO_MODE_PAL;
encoder->input = 0; encoder->input = 0;
encoder->enable = 1; encoder->enable = 1;
i = adv7175_write_block(encoder, init_common, sizeof(init_common)); for (i=1; i<x_common; i++) {
if (i >= 0) { rv = i2c_smbus_write_byte(client,init_common[i]);
i = adv7175_write(encoder, 0x07, TR0MODE | TR0RST); if (rv < 0) {
i = adv7175_write(encoder, 0x07, TR0MODE); printk(KERN_ERR "%s_attach: init error %d\n", client->name, rv);
i = adv7175_read(encoder, 0x12); break;
printk(KERN_INFO "%s_attach: %s rev. %d at 0x%02x\n", }
device->name, dname, i & 1, device->addr);
} }
if (i < 0) {
printk(KERN_ERR "%s_attach: init error %d\n", device->name, if (rv >= 0) {
i); i2c_smbus_write_byte_data(client,0x07, TR0MODE | TR0RST);
i2c_smbus_write_byte_data(client,0x07, TR0MODE);
i2c_smbus_read_byte_data(client,0x12);
printk(KERN_INFO "%s_attach: %s rev. %d at 0x%02x\n",
client->name, dname, rv & 1, client->addr);
} }
i2c_attach_client(client);
return 0; return 0;
} }
static
int adv717x_probe(struct i2c_adapter *adap)
{
return i2c_probe(adap, &addr_data, adv717x_attach);
}
static int adv7175_detach(struct i2c_device *device) static int adv717x_detach(struct i2c_client *client)
{ {
kfree(device->data); i2c_detach_client(client);
MOD_DEC_USE_COUNT; kfree(client->data);
kfree(client);
return 0; return 0;
} }
static int adv7175_command(struct i2c_device *device, unsigned int cmd, static int adv717x_command(struct i2c_client *client, unsigned int cmd,
void *arg) void *arg)
{ {
struct adv7175 *encoder = device->data; struct adv7175 *encoder = client->data;
int i, x_ntsc=13, x_pal=13;
/* x_ntsc is number of entries in init_ntsc -1 */
/* x_pal is number of entries in init_pal -1 */
switch (cmd) { switch (cmd) {
...@@ -286,29 +265,21 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd, ...@@ -286,29 +265,21 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd,
switch (iarg) { switch (iarg) {
case VIDEO_MODE_NTSC: case VIDEO_MODE_NTSC:
adv7175_write_block(encoder, for (i=1; i< x_ntsc; i++)
init_ntsc, i2c_smbus_write_byte(client, init_ntsc[i]);
sizeof
(init_ntsc));
if (encoder->input == 0) if (encoder->input == 0)
adv7175_write(encoder, 0x0d, 0x4f); // Enable genlock i2c_smbus_write_byte_data(client,0x0d, 0x4f); // Enable genlock
adv7175_write(encoder, 0x07, i2c_smbus_write_byte_data(client,0x07, TR0MODE | TR0RST);
TR0MODE | TR0RST); i2c_smbus_write_byte_data(client,0x07, TR0MODE);
adv7175_write(encoder, 0x07,
TR0MODE);
break; break;
case VIDEO_MODE_PAL: case VIDEO_MODE_PAL:
adv7175_write_block(encoder, for (i=1; i< x_pal; i++)
init_pal, i2c_smbus_write_byte(client, init_pal[i]);
sizeof
(init_pal));
if (encoder->input == 0) if (encoder->input == 0)
adv7175_write(encoder, 0x0d, 0x4f); // Enable genlock i2c_smbus_write_byte_data(client,0x0d, 0x4f); // Enable genlock
adv7175_write(encoder, 0x07, i2c_smbus_write_byte_data(client,0x07, TR0MODE | TR0RST);
TR0MODE | TR0RST); i2c_smbus_write_byte_data(client,0x07, TR0MODE);
adv7175_write(encoder, 0x07,
TR0MODE);
break; break;
case VIDEO_MODE_SECAM: // WARNING! ADV7176 does not support SECAM. case VIDEO_MODE_SECAM: // WARNING! ADV7176 does not support SECAM.
...@@ -316,27 +287,23 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd, ...@@ -316,27 +287,23 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd,
// it does not work due to genlock: when decoder // it does not work due to genlock: when decoder
// is in SECAM and encoder in in PAL the subcarrier // is in SECAM and encoder in in PAL the subcarrier
// can not be syncronized with horizontal frequency) // can not be syncronized with horizontal frequency)
adv7175_write_block(encoder, for (i=1; i< x_pal; i++)
init_pal, i2c_smbus_write_byte(client, init_pal[i]);
sizeof
(init_pal));
if (encoder->input == 0) if (encoder->input == 0)
adv7175_write(encoder, 0x0d, 0x49); // Disable genlock i2c_smbus_write_byte_data(client,0x0d, 0x49); // Disable genlock
adv7175_write(encoder, 0x07, i2c_smbus_write_byte_data(client,0x07, TR0MODE | TR0RST);
TR0MODE | TR0RST); i2c_smbus_write_byte_data(client,0x07, TR0MODE);
adv7175_write(encoder, 0x07,
TR0MODE);
break; break;
default: default:
printk(KERN_ERR printk(KERN_ERR
"%s: illegal norm: %d\n", "%s: illegal norm: %d\n",
device->name, iarg); client->name, iarg);
return -EINVAL; return -EINVAL;
} }
DEBUG(printk DEBUG(printk
(KERN_INFO "%s: switched to %s\n", (KERN_INFO "%s: switched to %s\n",
device->name, norms[iarg])); client->name, norms[iarg]));
encoder->norm = iarg; encoder->norm = iarg;
} }
} }
...@@ -354,51 +321,45 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd, ...@@ -354,51 +321,45 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd,
switch (iarg) { switch (iarg) {
case 0: case 0:
adv7175_write(encoder, 0x01, 0x00); i2c_smbus_write_byte_data(client, 0x01, 0x00);
adv7175_write(encoder, 0x0c, TR1CAPT); /* TR1 */ i2c_smbus_write_byte_data(client, 0x0c, TR1CAPT); /* TR1 */
if (encoder->norm == if (encoder->norm ==
VIDEO_MODE_SECAM) VIDEO_MODE_SECAM)
adv7175_write(encoder, 0x0d, 0x49); // Disable genlock i2c_smbus_write_byte_data(client, 0x0d, 0x49); // Disable genlock
else else
adv7175_write(encoder, 0x0d, 0x4f); // Enable genlock i2c_smbus_write_byte_data(client, 0x0d, 0x4f); // Enable genlock
adv7175_write(encoder, 0x07, i2c_smbus_write_byte_data(client, 0x07, TR0MODE | TR0RST);
TR0MODE | TR0RST); i2c_smbus_write_byte_data(client, 0x07, TR0MODE);
adv7175_write(encoder, 0x07,
TR0MODE);
//udelay(10); //udelay(10);
break; break;
case 1: case 1:
adv7175_write(encoder, 0x01, 0x00); i2c_smbus_write_byte_data(client, 0x01, 0x00);
adv7175_write(encoder, 0x0c, TR1PLAY); /* TR1 */ i2c_smbus_write_byte_data(client, 0x0c, TR1PLAY); /* TR1 */
adv7175_write(encoder, 0x0d, 0x49); i2c_smbus_write_byte_data(client, 0x0d, 0x49);
adv7175_write(encoder, 0x07, i2c_smbus_write_byte_data(client, 0x07, TR0MODE | TR0RST);
TR0MODE | TR0RST); i2c_smbus_write_byte_data(client, 0x07, TR0MODE);
adv7175_write(encoder, 0x07,
TR0MODE);
//udelay(10); //udelay(10);
break; break;
case 2: case 2:
adv7175_write(encoder, 0x01, 0x80); i2c_smbus_write_byte_data(client, 0x01, 0x80);
adv7175_write(encoder, 0x0d, 0x49); i2c_smbus_write_byte_data(client, 0x0d, 0x49);
adv7175_write(encoder, 0x07, i2c_smbus_write_byte_data(client, 0x07, TR0MODE | TR0RST);
TR0MODE | TR0RST); i2c_smbus_write_byte_data(client, 0x07, TR0MODE);
adv7175_write(encoder, 0x07,
TR0MODE);
//udelay(10); //udelay(10);
break; break;
default: default:
printk(KERN_ERR printk(KERN_ERR
"%s: illegal input: %d\n", "%s: illegal input: %d\n",
device->name, iarg); client->name, iarg);
return -EINVAL; return -EINVAL;
} }
DEBUG(printk DEBUG(printk
(KERN_INFO "%s: switched to %s\n", (KERN_INFO "%s: switched to %s\n",
device->name, inputs[iarg])); client->name, inputs[iarg]));
encoder->input = iarg; encoder->input = iarg;
} }
} }
...@@ -420,7 +381,7 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd, ...@@ -420,7 +381,7 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd,
int *iarg = arg; int *iarg = arg;
encoder->enable = !!*iarg; encoder->enable = !!*iarg;
adv7175_write(encoder, 0x61, i2c_smbus_write_byte_data(client, 0x61,
(encoder-> (encoder->
reg[0x61] & 0xbf) | (encoder-> reg[0x61] & 0xbf) | (encoder->
enable ? 0x00 : enable ? 0x00 :
...@@ -435,42 +396,60 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd, ...@@ -435,42 +396,60 @@ static int adv7175_command(struct i2c_device *device, unsigned int cmd,
return 0; return 0;
} }
static void adv717x_inc_use(struct i2c_client *client)
{
MOD_INC_USE_COUNT;
}
static void adv717x_dec_use(struct i2c_client *client)
{
MOD_DEC_USE_COUNT;
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_adv7175 = { static struct i2c_driver i2c_driver_adv7175 = {
"adv7175", /* name */ name: "adv7175", /* name */
I2C_DRIVERID_VIDEOENCODER, /* ID */ id: I2C_DRIVERID_ADV717x, /* ID */
I2C_ADV7175, I2C_ADV7175 + 3, flags: I2C_DF_NOTIFY, //I2C_ADV7175, I2C_ADV7175 + 3,
attach_adapter: adv717x_probe,
adv7175_attach, detach_client: adv717x_detach,
adv7175_detach, command: adv717x_command,
adv7175_command inc_use: &adv717x_inc_use,
dec_use: &adv717x_dec_use
}; };
static struct i2c_driver i2c_driver_adv7176 = { static struct i2c_driver i2c_driver_adv7176 = {
"adv7175", /* name */ name: "adv7176", /* name */
I2C_DRIVERID_VIDEOENCODER, /* ID */ id: I2C_DRIVERID_ADV717x, /* ID */
I2C_ADV7176, I2C_ADV7176 + 3, flags: I2C_DF_NOTIFY, //I2C_ADV7176, I2C_ADV7176 + 3,
attach_adapter: adv717x_probe,
detach_client: adv717x_detach,
command: adv717x_command,
inc_use: &adv717x_inc_use,
dec_use: &adv717x_dec_use
};
adv7175_attach, static struct i2c_client client_template = {
adv7175_detach, name: "adv7175_client",
adv7175_command driver: &i2c_driver_adv7175
}; };
static int adv7175_init(void) static int adv717x_init(void)
{ {
int res_adv7175 = 0, res_adv7176 = 0; int res_adv7175 = 0, res_adv7176 = 0;
res_adv7175 = i2c_register_driver(&i2c_driver_adv7175); res_adv7175 = i2c_add_driver(&i2c_driver_adv7175);
res_adv7176 = i2c_register_driver(&i2c_driver_adv7176); res_adv7176 = i2c_add_driver(&i2c_driver_adv7176);
return (res_adv7175 | res_adv7176); // Any idea how to make it better? return (res_adv7175 | res_adv7176); // Any idea how to make it better?
} }
static void adv7175_exit(void) static void adv717x_exit(void)
{ {
i2c_unregister_driver(&i2c_driver_adv7176); i2c_del_driver(&i2c_driver_adv7176);
i2c_unregister_driver(&i2c_driver_adv7175); i2c_del_driver(&i2c_driver_adv7175);
} }
module_init(adv7175_init); module_init(adv717x_init);
module_exit(adv7175_exit); module_exit(adv717x_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7