Skip to content

L
linux-davinci
Commit b9a21f84 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (9198): adv7170: convert i2c driver for new i2c API 

- Convert to use v4l2-i2c-drv-legacy.h to be able to handle the new i2c API
- Cleanups
- Use v4l_dbg/v4l_info to have uniform kernel messages
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 54c776a5
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 194 deletions
drivers/media/video/adv7170.c
View file @ b9a21f84
...@@ -29,43 +29,24 @@ ...@@ -29,43 +29,24 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/signal.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/i2c.h> #include <linux/ioctl.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/i2c.h>
#include <linux/i2c-id.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <linux/video_encoder.h> #include <linux/video_encoder.h>
#include <media/v4l2-common.h>
#include <media/v4l2-i2c-drv-legacy.h>
MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver"); MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
MODULE_AUTHOR("Maxim Yevtyushkin"); MODULE_AUTHOR("Maxim Yevtyushkin");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define I2C_NAME(x) (x)->name
static int debug; static int debug;
module_param(debug, int, 0); module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "Debug level (0-1)"); MODULE_PARM_DESC(debug, "Debug level (0-1)");
#define dprintk(num, format, args...) \
do { \
if (debug >= num) \
printk(format, ##args); \
} while (0)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
struct adv7170 { struct adv7170 {
...@@ -80,21 +61,12 @@ struct adv7170 { ...@@ -80,21 +61,12 @@ struct adv7170 {
int sat; int sat;
}; };
#define I2C_ADV7170 0xd4
#define I2C_ADV7171 0x54
static char adv7170_name[] = "adv7170";
static char adv7171_name[] = "adv7171";
static char *inputs[] = { "pass_through", "play_back" }; static char *inputs[] = { "pass_through", "play_back" };
static char *norms[] = { "PAL", "NTSC" }; static char *norms[] = { "PAL", "NTSC" };
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static inline int static inline int adv7170_write(struct i2c_client *client, u8 reg, u8 value)
adv7170_write (struct i2c_client *client,
u8 reg,
u8 value)
{ {
struct adv7170 *encoder = i2c_get_clientdata(client); struct adv7170 *encoder = i2c_get_clientdata(client);
...@@ -102,17 +74,13 @@ adv7170_write (struct i2c_client *client, ...@@ -102,17 +74,13 @@ adv7170_write (struct i2c_client *client,
return i2c_smbus_write_byte_data(client, reg, value); return i2c_smbus_write_byte_data(client, reg, value);
} }
static inline int static inline int adv7170_read(struct i2c_client *client, u8 reg)
adv7170_read (struct i2c_client *client,
u8 reg)
{ {
return i2c_smbus_read_byte_data(client, reg); return i2c_smbus_read_byte_data(client, reg);
} }
static int static int adv7170_write_block(struct i2c_client *client,
adv7170_write_block (struct i2c_client *client, const u8 *data, unsigned int len)
const u8 *data,
unsigned int len)
{ {
int ret = -1; int ret = -1;
u8 reg; u8 reg;
...@@ -133,33 +101,25 @@ adv7170_write_block (struct i2c_client *client, ...@@ -133,33 +101,25 @@ adv7170_write_block (struct i2c_client *client,
encoder->reg[reg++] = data[1]; encoder->reg[reg++] = data[1];
len -= 2; len -= 2;
data += 2; data += 2;
} while (len >= 2 && data[0] == reg && } while (len >= 2 && data[0] == reg && block_len < 32);
block_len < 32); ret = i2c_master_send(client, block_data, block_len);
if ((ret = i2c_master_send(client, block_data, if (ret < 0)
block_len)) < 0)
break; break;
} }
} else { } else {
/* do some slow I2C emulation kind of thing */ /* do some slow I2C emulation kind of thing */
while (len >= 2) { while (len >= 2) {
reg = *data++; reg = *data++;
if ((ret = adv7170_write(client, reg, ret = adv7170_write(client, reg, *data++);
*data++)) < 0) if (ret < 0)
break; break;
len -= 2; len -= 2;
} }
} }
return ret; return ret;
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
// Output filter: S-Video Composite
#define MR050 0x11 //0x09
#define MR060 0x14 //0x0c
//---------------------------------------------------------------------------
#define TR0MODE 0x4c #define TR0MODE 0x4c
#define TR0RST 0x80 #define TR0RST 0x80
...@@ -167,7 +127,6 @@ adv7170_write_block (struct i2c_client *client, ...@@ -167,7 +127,6 @@ adv7170_write_block (struct i2c_client *client,
#define TR1CAPT 0x00 #define TR1CAPT 0x00
#define TR1PLAY 0x00 #define TR1PLAY 0x00
static const unsigned char init_NTSC[] = { static const unsigned char init_NTSC[] = {
0x00, 0x10, // MR0 0x00, 0x10, // MR0
0x01, 0x20, // MR1 0x01, 0x20, // MR1
...@@ -227,15 +186,11 @@ static const unsigned char init_PAL[] = { ...@@ -227,15 +186,11 @@ static const unsigned char init_PAL[] = {
}; };
static int static int adv7170_command(struct i2c_client *client, unsigned cmd, void *arg)
adv7170_command (struct i2c_client *client,
unsigned int cmd,
void * arg)
{ {
struct adv7170 *encoder = i2c_get_clientdata(client); struct adv7170 *encoder = i2c_get_clientdata(client);
switch (cmd) { switch (cmd) {
case 0: case 0:
#if 0 #if 0
/* This is just for testing!!! */ /* This is just for testing!!! */
...@@ -254,18 +209,16 @@ adv7170_command (struct i2c_client *client, ...@@ -254,18 +209,16 @@ adv7170_command (struct i2c_client *client,
VIDEO_ENCODER_NTSC; VIDEO_ENCODER_NTSC;
cap->inputs = 2; cap->inputs = 2;
cap->outputs = 1; cap->outputs = 1;
}
break; break;
}
case ENCODER_SET_NORM: case ENCODER_SET_NORM:
{ {
int iarg = *(int *) arg; int iarg = *(int *) arg;
dprintk(1, KERN_DEBUG "%s_command: set norm %d", v4l_dbg(1, debug, client, "set norm %d\n", iarg);
I2C_NAME(client), iarg);
switch (iarg) { switch (iarg) {
case VIDEO_MODE_NTSC: case VIDEO_MODE_NTSC:
adv7170_write_block(client, init_NTSC, adv7170_write_block(client, init_NTSC,
sizeof(init_NTSC)); sizeof(init_NTSC));
...@@ -285,16 +238,13 @@ adv7170_command (struct i2c_client *client, ...@@ -285,16 +238,13 @@ adv7170_command (struct i2c_client *client,
break; break;
default: default:
dprintk(1, KERN_ERR "%s: illegal norm: %d\n", v4l_dbg(1, debug, client, "illegal norm: %d\n", iarg);
I2C_NAME(client), iarg);
return -EINVAL; return -EINVAL;
} }
dprintk(1, KERN_DEBUG "%s: switched to %s\n", I2C_NAME(client), v4l_dbg(1, debug, client, "switched to %s\n", norms[iarg]);
norms[iarg]);
encoder->norm = iarg; encoder->norm = iarg;
}
break; break;
}
case ENCODER_SET_INPUT: case ENCODER_SET_INPUT:
{ {
...@@ -304,19 +254,17 @@ adv7170_command (struct i2c_client *client, ...@@ -304,19 +254,17 @@ adv7170_command (struct i2c_client *client,
*iarg = 1: input is from ZR36060 *iarg = 1: input is from ZR36060
*iarg = 2: color bar */ *iarg = 2: color bar */
dprintk(1, KERN_DEBUG "%s_command: set input from %s\n", v4l_dbg(1, debug, client, "set input from %s\n",
I2C_NAME(client),
iarg == 0 ? "decoder" : "ZR36060"); iarg == 0 ? "decoder" : "ZR36060");
switch (iarg) { switch (iarg) {
case 0: case 0:
adv7170_write(client, 0x01, 0x20); adv7170_write(client, 0x01, 0x20);
adv7170_write(client, 0x08, TR1CAPT); /* TR1 */ adv7170_write(client, 0x08, TR1CAPT); /* TR1 */
adv7170_write(client, 0x02, 0x0e); // Enable genlock adv7170_write(client, 0x02, 0x0e); // Enable genlock
adv7170_write(client, 0x07, TR0MODE | TR0RST); adv7170_write(client, 0x07, TR0MODE | TR0RST);
adv7170_write(client, 0x07, TR0MODE); adv7170_write(client, 0x07, TR0MODE);
//udelay(10); /* udelay(10); */
break; break;
case 1: case 1:
...@@ -325,20 +273,17 @@ adv7170_command (struct i2c_client *client, ...@@ -325,20 +273,17 @@ adv7170_command (struct i2c_client *client,
adv7170_write(client, 0x02, 0x08); adv7170_write(client, 0x02, 0x08);
adv7170_write(client, 0x07, TR0MODE | TR0RST); adv7170_write(client, 0x07, TR0MODE | TR0RST);
adv7170_write(client, 0x07, TR0MODE); adv7170_write(client, 0x07, TR0MODE);
//udelay(10); /* udelay(10); */
break; break;
default: default:
dprintk(1, KERN_ERR "%s: illegal input: %d\n", v4l_dbg(1, debug, client, "illegal input: %d\n", iarg);
I2C_NAME(client), iarg);
return -EINVAL; return -EINVAL;
} }
dprintk(1, KERN_DEBUG "%s: switched to %s\n", I2C_NAME(client), v4l_dbg(1, debug, client, "switched to %s\n", inputs[iarg]);
inputs[iarg]);
encoder->input = iarg; encoder->input = iarg;
}
break; break;
}
case ENCODER_SET_OUTPUT: case ENCODER_SET_OUTPUT:
{ {
...@@ -348,16 +293,16 @@ adv7170_command (struct i2c_client *client, ...@@ -348,16 +293,16 @@ adv7170_command (struct i2c_client *client,
if (*iarg != 0) { if (*iarg != 0) {
return -EINVAL; return -EINVAL;
} }
}
break; break;
}
case ENCODER_ENABLE_OUTPUT: case ENCODER_ENABLE_OUTPUT:
{ {
int *iarg = arg; int *iarg = arg;
encoder->enable = !!*iarg; encoder->enable = !!*iarg;
}
break; break;
}
default: default:
return -EINVAL; return -EINVAL;
...@@ -368,149 +313,67 @@ adv7170_command (struct i2c_client *client, ...@@ -368,149 +313,67 @@ adv7170_command (struct i2c_client *client,
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* static unsigned short normal_i2c[] = {
* Generic i2c probe 0xd4 >> 1, 0xd6 >> 1, /* adv7170 IDs */
* concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1' 0x54 >> 1, 0x56 >> 1, /* adv7171 IDs */
*/
static unsigned short normal_i2c[] =
{ I2C_ADV7170 >> 1, (I2C_ADV7170 >> 1) + 1,
I2C_ADV7171 >> 1, (I2C_ADV7171 >> 1) + 1,
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short ignore = I2C_CLIENT_END; I2C_CLIENT_INSMOD;
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c,
.probe = &ignore,
.ignore = &ignore,
};
static struct i2c_driver i2c_driver_adv7170; static int adv7170_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int
adv7170_detect_client (struct i2c_adapter *adapter,
int address,
int kind)
{ {
int i;
struct i2c_client *client;
struct adv7170 *encoder; struct adv7170 *encoder;
char *dname; int i;
dprintk(1,
KERN_INFO
"adv7170.c: detecting adv7170 client on address 0x%x\n",
address << 1);
/* Check if the adapter supports the needed features */ /* Check if the adapter supports the needed features */
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return 0; return -ENODEV;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); v4l_info(client, "chip found @ 0x%x (%s)\n",
if (!client) client->addr << 1, client->adapter->name);
return -ENOMEM;
client->addr = address;
client->adapter = adapter;
client->driver = &i2c_driver_adv7170;
if ((client->addr == I2C_ADV7170 >> 1) ||
(client->addr == (I2C_ADV7170 >> 1) + 1)) {
dname = adv7170_name;
} else if ((client->addr == I2C_ADV7171 >> 1) ||
(client->addr == (I2C_ADV7171 >> 1) + 1)) {
dname = adv7171_name;
} else {
/* We should never get here!!! */
kfree(client);
return 0;
}
strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
encoder = kzalloc(sizeof(struct adv7170), GFP_KERNEL); encoder = kzalloc(sizeof(struct adv7170), GFP_KERNEL);
if (encoder == NULL) { if (encoder == NULL)
kfree(client);
return -ENOMEM; return -ENOMEM;
}
encoder->norm = VIDEO_MODE_NTSC; encoder->norm = VIDEO_MODE_NTSC;
encoder->input = 0; encoder->input = 0;
encoder->enable = 1; encoder->enable = 1;
i2c_set_clientdata(client, encoder); i2c_set_clientdata(client, encoder);
i = i2c_attach_client(client);
if (i) {
kfree(client);
kfree(encoder);
return i;
}
i = adv7170_write_block(client, init_NTSC, sizeof(init_NTSC)); i = adv7170_write_block(client, init_NTSC, sizeof(init_NTSC));
if (i >= 0) { if (i >= 0) {
i = adv7170_write(client, 0x07, TR0MODE | TR0RST); i = adv7170_write(client, 0x07, TR0MODE | TR0RST);
i = adv7170_write(client, 0x07, TR0MODE); i = adv7170_write(client, 0x07, TR0MODE);
i = adv7170_read(client, 0x12); i = adv7170_read(client, 0x12);
dprintk(1, KERN_INFO "%s_attach: rev. %d at 0x%02x\n", v4l_dbg(1, debug, client, "revision %d\n", i & 1);
I2C_NAME(client), i & 1, client->addr << 1);
} }
if (i < 0) { if (i < 0)
dprintk(1, KERN_ERR "%s_attach: init error 0x%x\n", v4l_dbg(1, debug, client, "init error 0x%x\n", i);
I2C_NAME(client), i);
}
return 0; return 0;
} }
static int static int adv7170_remove(struct i2c_client *client)
adv7170_attach_adapter (struct i2c_adapter *adapter)
{ {
dprintk(1, kfree(i2c_get_clientdata(client));
KERN_INFO
"adv7170.c: starting probe for adapter %s (0x%x)\n",
I2C_NAME(adapter), adapter->id);
return i2c_probe(adapter, &addr_data, &adv7170_detect_client);
}
static int
adv7170_detach_client (struct i2c_client *client)
{
struct adv7170 *encoder = i2c_get_clientdata(client);
int err;
err = i2c_detach_client(client);
if (err) {
return err;
}
kfree(encoder);
kfree(client);
return 0; return 0;
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_adv7170 = { static const struct i2c_device_id adv7170_id[] = {
.driver = { { "adv7170", 0 },
.name = "adv7170", /* name */ { "adv7171", 0 },
}, { }
};
.id = I2C_DRIVERID_ADV7170, MODULE_DEVICE_TABLE(i2c, adv7170_id);
.attach_adapter = adv7170_attach_adapter, static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.detach_client = adv7170_detach_client, .name = "adv7170",
.driverid = I2C_DRIVERID_ADV7170,
.command = adv7170_command, .command = adv7170_command,
.probe = adv7170_probe,
.remove = adv7170_remove,
.id_table = adv7170_id,
}; };
static int __init
adv7170_init (void)
{
return i2c_add_driver(&i2c_driver_adv7170);
}
static void __exit
adv7170_exit (void)
{
i2c_del_driver(&i2c_driver_adv7170);
}
module_init(adv7170_init);
module_exit(adv7170_exit);
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