Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 161
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 7e5eaadc 编写于 作者: H Hans Verkuil 提交者： Mauro Carvalho Chehab
浏览文件
操作

V4L/DVB (10726): vpx3220: convert to v4l2_subdev. 

Signed-off-by: NHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 780d8e15
隐藏空白更改
内联 并排
Showing with 271 addition and 231 deletion
drivers/media/video/vpx3220.c
浏览文件 @ 7e5eaadc
...@@ -24,11 +24,10 @@ ...@@ -24,11 +24,10 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <media/v4l2-common.h>
#include <media/v4l2-i2c-drv-legacy.h>
#include <linux/videodev.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/video_decoder.h> #include <media/v4l2-device.h>
#include <media/v4l2-chip-ident.h>
#include <media/v4l2-i2c-drv-legacy.h>
MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver"); MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver");
MODULE_AUTHOR("Laurent Pinchart"); MODULE_AUTHOR("Laurent Pinchart");
...@@ -38,14 +37,20 @@ static int debug; ...@@ -38,14 +37,20 @@ 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)");
static unsigned short normal_i2c[] = { 0x86 >> 1, 0x8e >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
#define VPX_TIMEOUT_COUNT 10 #define VPX_TIMEOUT_COUNT 10
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
struct vpx3220 { struct vpx3220 {
struct v4l2_subdev sd;
unsigned char reg[255]; unsigned char reg[255];
v4l2_std_id norm; v4l2_std_id norm;
int ident;
int input; int input;
int enable; int enable;
int bright; int bright;
...@@ -54,30 +59,38 @@ struct vpx3220 { ...@@ -54,30 +59,38 @@ struct vpx3220 {
int sat; int sat;
}; };
static inline struct vpx3220 *to_vpx3220(struct v4l2_subdev *sd)
{
return container_of(sd, struct vpx3220, sd);
}
static char *inputs[] = { "internal", "composite", "svideo" }; static char *inputs[] = { "internal", "composite", "svideo" };
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static inline int vpx3220_write(struct i2c_client *client, u8 reg, u8 value) static inline int vpx3220_write(struct v4l2_subdev *sd, u8 reg, u8 value)
{ {
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct vpx3220 *decoder = i2c_get_clientdata(client); struct vpx3220 *decoder = i2c_get_clientdata(client);
decoder->reg[reg] = value; decoder->reg[reg] = value;
return i2c_smbus_write_byte_data(client, reg, value); return i2c_smbus_write_byte_data(client, reg, value);
} }
static inline int vpx3220_read(struct i2c_client *client, u8 reg) static inline int vpx3220_read(struct v4l2_subdev *sd, u8 reg)
{ {
struct i2c_client *client = v4l2_get_subdevdata(sd);
return i2c_smbus_read_byte_data(client, reg); return i2c_smbus_read_byte_data(client, reg);
} }
static int vpx3220_fp_status(struct i2c_client *client) static int vpx3220_fp_status(struct v4l2_subdev *sd)
{ {
unsigned char status; unsigned char status;
unsigned int i; unsigned int i;
for (i = 0; i < VPX_TIMEOUT_COUNT; i++) { for (i = 0; i < VPX_TIMEOUT_COUNT; i++) {
status = vpx3220_read(client, 0x29); status = vpx3220_read(sd, 0x29);
if (!(status & 4)) if (!(status & 4))
return 0; return 0;
...@@ -91,57 +104,60 @@ static int vpx3220_fp_status(struct i2c_client *client) ...@@ -91,57 +104,60 @@ static int vpx3220_fp_status(struct i2c_client *client)
return -1; return -1;
} }
static int vpx3220_fp_write(struct i2c_client *client, u8 fpaddr, u16 data) static int vpx3220_fp_write(struct v4l2_subdev *sd, u8 fpaddr, u16 data)
{ {
struct i2c_client *client = v4l2_get_subdevdata(sd);
/* Write the 16-bit address to the FPWR register */ /* Write the 16-bit address to the FPWR register */
if (i2c_smbus_write_word_data(client, 0x27, swab16(fpaddr)) == -1) { if (i2c_smbus_write_word_data(client, 0x27, swab16(fpaddr)) == -1) {
v4l_dbg(1, debug, client, "%s: failed\n", __func__); v4l2_dbg(1, debug, sd, "%s: failed\n", __func__);
return -1; return -1;
} }
if (vpx3220_fp_status(client) < 0) if (vpx3220_fp_status(sd) < 0)
return -1; return -1;
/* Write the 16-bit data to the FPDAT register */ /* Write the 16-bit data to the FPDAT register */
if (i2c_smbus_write_word_data(client, 0x28, swab16(data)) == -1) { if (i2c_smbus_write_word_data(client, 0x28, swab16(data)) == -1) {
v4l_dbg(1, debug, client, "%s: failed\n", __func__); v4l2_dbg(1, debug, sd, "%s: failed\n", __func__);
return -1; return -1;
} }
return 0; return 0;
} }
static u16 vpx3220_fp_read(struct i2c_client *client, u16 fpaddr) static u16 vpx3220_fp_read(struct v4l2_subdev *sd, u16 fpaddr)
{ {
struct i2c_client *client = v4l2_get_subdevdata(sd);
s16 data; s16 data;
/* Write the 16-bit address to the FPRD register */ /* Write the 16-bit address to the FPRD register */
if (i2c_smbus_write_word_data(client, 0x26, swab16(fpaddr)) == -1) { if (i2c_smbus_write_word_data(client, 0x26, swab16(fpaddr)) == -1) {
v4l_dbg(1, debug, client, "%s: failed\n", __func__); v4l2_dbg(1, debug, sd, "%s: failed\n", __func__);
return -1; return -1;
} }
if (vpx3220_fp_status(client) < 0) if (vpx3220_fp_status(sd) < 0)
return -1; return -1;
/* Read the 16-bit data from the FPDAT register */ /* Read the 16-bit data from the FPDAT register */
data = i2c_smbus_read_word_data(client, 0x28); data = i2c_smbus_read_word_data(client, 0x28);
if (data == -1) { if (data == -1) {
v4l_dbg(1, debug, client, "%s: failed\n", __func__); v4l2_dbg(1, debug, sd, "%s: failed\n", __func__);
return -1; return -1;
} }
return swab16(data); return swab16(data);
} }
static int vpx3220_write_block(struct i2c_client *client, const u8 *data, unsigned int len) static int vpx3220_write_block(struct v4l2_subdev *sd, const u8 *data, unsigned int len)
{ {
u8 reg; u8 reg;
int ret = -1; int ret = -1;
while (len >= 2) { while (len >= 2) {
reg = *data++; reg = *data++;
ret = vpx3220_write(client, reg, *data++); ret = vpx3220_write(sd, reg, *data++);
if (ret < 0) if (ret < 0)
break; break;
len -= 2; len -= 2;
...@@ -150,7 +166,7 @@ static int vpx3220_write_block(struct i2c_client *client, const u8 *data, unsign ...@@ -150,7 +166,7 @@ static int vpx3220_write_block(struct i2c_client *client, const u8 *data, unsign
return ret; return ret;
} }
static int vpx3220_write_fp_block(struct i2c_client *client, static int vpx3220_write_fp_block(struct v4l2_subdev *sd,
const u16 *data, unsigned int len) const u16 *data, unsigned int len)
{ {
u8 reg; u8 reg;
...@@ -158,7 +174,7 @@ static int vpx3220_write_fp_block(struct i2c_client *client, ...@@ -158,7 +174,7 @@ static int vpx3220_write_fp_block(struct i2c_client *client,
while (len > 1) { while (len > 1) {
reg = *data++; reg = *data++;
ret |= vpx3220_fp_write(client, reg, *data++); ret |= vpx3220_fp_write(sd, reg, *data++);
len -= 2; len -= 2;
} }
...@@ -261,272 +277,281 @@ static const unsigned short init_fp[] = { ...@@ -261,272 +277,281 @@ static const unsigned short init_fp[] = {
}; };
static int vpx3220_command(struct i2c_client *client, unsigned cmd, void *arg) static int vpx3220_init(struct v4l2_subdev *sd, u32 val)
{ {
struct vpx3220 *decoder = i2c_get_clientdata(client); struct vpx3220 *decoder = to_vpx3220(sd);
switch (cmd) { vpx3220_write_block(sd, init_common, sizeof(init_common));
case VIDIOC_INT_INIT: vpx3220_write_fp_block(sd, init_fp, sizeof(init_fp) >> 1);
{ if (decoder->norm & V4L2_STD_NTSC)
vpx3220_write_block(client, init_common, vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1);
sizeof(init_common)); else if (decoder->norm & V4L2_STD_PAL)
vpx3220_write_fp_block(client, init_fp, vpx3220_write_fp_block(sd, init_pal, sizeof(init_pal) >> 1);
sizeof(init_fp) >> 1); else if (decoder->norm & V4L2_STD_SECAM)
if (decoder->norm & V4L2_STD_NTSC) { vpx3220_write_fp_block(sd, init_secam, sizeof(init_secam) >> 1);
vpx3220_write_fp_block(client, init_ntsc, else
sizeof(init_ntsc) >> 1); vpx3220_write_fp_block(sd, init_pal, sizeof(init_pal) >> 1);
} else if (decoder->norm & V4L2_STD_PAL) { return 0;
vpx3220_write_fp_block(client, init_pal, }
sizeof(init_pal) >> 1);
} else if (decoder->norm & V4L2_STD_SECAM) {
vpx3220_write_fp_block(client, init_secam,
sizeof(init_secam) >> 1);
} else {
vpx3220_write_fp_block(client, init_pal,
sizeof(init_pal) >> 1);
}
break;
}
case VIDIOC_QUERYSTD: static int vpx3220_status(struct v4l2_subdev *sd, u32 *pstatus, v4l2_std_id *pstd)
case VIDIOC_INT_G_INPUT_STATUS: {
{ int res = V4L2_IN_ST_NO_SIGNAL, status;
int res = V4L2_IN_ST_NO_SIGNAL, status; v4l2_std_id std = 0;
v4l2_std_id std = 0;
v4l_dbg(1, debug, client, "VIDIOC_QUERYSTD/VIDIOC_INT_G_INPUT_STATUS\n"); v4l2_dbg(1, debug, sd, "VIDIOC_QUERYSTD/VIDIOC_INT_G_INPUT_STATUS\n");
status = vpx3220_fp_read(client, 0x0f3); status = vpx3220_fp_read(sd, 0x0f3);
v4l_dbg(1, debug, client, "status: 0x%04x\n", status); v4l2_dbg(1, debug, sd, "status: 0x%04x\n", status);
if (status < 0) if (status < 0)
return status; return status;
if ((status & 0x20) == 0) { if ((status & 0x20) == 0) {
res = 0; res = 0;
switch (status & 0x18) { switch (status & 0x18) {
case 0x00: case 0x00:
case 0x10: case 0x10:
case 0x14: case 0x14:
case 0x18: case 0x18:
std = V4L2_STD_PAL; std = V4L2_STD_PAL;
break; break;
case 0x08: case 0x08:
std = V4L2_STD_SECAM; std = V4L2_STD_SECAM;
break; break;
case 0x04: case 0x04:
case 0x0c: case 0x0c:
case 0x1c: case 0x1c:
std = V4L2_STD_NTSC; std = V4L2_STD_NTSC;
break; break;
}
} }
if (cmd == VIDIOC_QUERYSTD)
*(v4l2_std_id *)arg = std;
else
*(int *)arg = res;
break;
} }
if (pstd)
*pstd = std;
if (pstatus)
*pstatus = status;
return 0;
}
case VIDIOC_S_STD: static int vpx3220_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
{ {
v4l2_std_id *iarg = arg; return vpx3220_status(sd, NULL, std);
int temp_input; }
/* Here we back up the input selection because it gets
overwritten when we fill the registers with the
choosen video norm */
temp_input = vpx3220_fp_read(client, 0xf2);
v4l_dbg(1, debug, client, "VIDIOC_S_STD %llx\n", *iarg);
if (*iarg & V4L2_STD_NTSC) {
vpx3220_write_fp_block(client, init_ntsc,
sizeof(init_ntsc) >> 1);
v4l_dbg(1, debug, client, "norm switched to NTSC\n");
} else if (*iarg & V4L2_STD_PAL) {
vpx3220_write_fp_block(client, init_pal,
sizeof(init_pal) >> 1);
v4l_dbg(1, debug, client, "norm switched to PAL\n");
} else if (*iarg & V4L2_STD_SECAM) {
vpx3220_write_fp_block(client, init_secam,
sizeof(init_secam) >> 1);
v4l_dbg(1, debug, client, "norm switched to SECAM\n");
} else {
return -EINVAL;
}
decoder->norm = *iarg; static int vpx3220_g_input_status(struct v4l2_subdev *sd, u32 *status)
{
return vpx3220_status(sd, status, NULL);
}
/* And here we set the backed up video input again */ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
vpx3220_fp_write(client, 0xf2, temp_input | 0x0010); {
udelay(10); struct vpx3220 *decoder = to_vpx3220(sd);
break; int temp_input;
/* Here we back up the input selection because it gets
overwritten when we fill the registers with the
choosen video norm */
temp_input = vpx3220_fp_read(sd, 0xf2);
v4l2_dbg(1, debug, sd, "VIDIOC_S_STD %llx\n", std);
if (std & V4L2_STD_NTSC) {
vpx3220_write_fp_block(sd, init_ntsc, sizeof(init_ntsc) >> 1);
v4l2_dbg(1, debug, sd, "norm switched to NTSC\n");
} else if (std & V4L2_STD_PAL) {
vpx3220_write_fp_block(sd, init_pal, sizeof(init_pal) >> 1);
v4l2_dbg(1, debug, sd, "norm switched to PAL\n");
} else if (std & V4L2_STD_SECAM) {
vpx3220_write_fp_block(sd, init_secam, sizeof(init_secam) >> 1);
v4l2_dbg(1, debug, sd, "norm switched to SECAM\n");
} else {
return -EINVAL;
} }
case VIDIOC_INT_S_VIDEO_ROUTING: decoder->norm = std;
{
struct v4l2_routing *route = arg;
int data;
/* RJ: *iarg = 0: ST8 (PCTV) input /* And here we set the backed up video input again */
*iarg = 1: COMPOSITE input vpx3220_fp_write(sd, 0xf2, temp_input | 0x0010);
*iarg = 2: SVHS input */ udelay(10);
return 0;
}
const int input[3][2] = { static int vpx3220_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
{0x0c, 0}, {
{0x0d, 0}, int data;
{0x0e, 1}
};
if (route->input < 0 || route->input > 2) /* RJ: route->input = 0: ST8 (PCTV) input
return -EINVAL; route->input = 1: COMPOSITE input
route->input = 2: SVHS input */
v4l_dbg(1, debug, client, "input switched to %s\n", inputs[route->input]); const int input[3][2] = {
{0x0c, 0},
{0x0d, 0},
{0x0e, 1}
};
vpx3220_write(client, 0x33, input[route->input][0]); if (route->input < 0 || route->input > 2)
return -EINVAL;
data = vpx3220_fp_read(client, 0xf2) & ~(0x0020); v4l2_dbg(1, debug, sd, "input switched to %s\n", inputs[route->input]);
if (data < 0)
return data;
/* 0x0010 is required to latch the setting */
vpx3220_fp_write(client, 0xf2,
data | (input[route->input][1] << 5) | 0x0010);
udelay(10); vpx3220_write(sd, 0x33, input[route->input][0]);
break;
}
case VIDIOC_STREAMON: data = vpx3220_fp_read(sd, 0xf2) & ~(0x0020);
case VIDIOC_STREAMOFF: if (data < 0)
{ return data;
int on = cmd == VIDIOC_STREAMON; /* 0x0010 is required to latch the setting */
v4l_dbg(1, debug, client, "VIDIOC_STREAM%s\n", on ? "ON" : "OFF"); vpx3220_fp_write(sd, 0xf2,
data | (input[route->input][1] << 5) | 0x0010);
vpx3220_write(client, 0xf2, (on ? 0x1b : 0x00)); udelay(10);
break; return 0;
} }
case VIDIOC_QUERYCTRL: static int vpx3220_s_stream(struct v4l2_subdev *sd, int enable)
{ {
struct v4l2_queryctrl *qc = arg; v4l2_dbg(1, debug, sd, "VIDIOC_STREAM%s\n", enable ? "ON" : "OFF");
switch (qc->id) { vpx3220_write(sd, 0xf2, (enable ? 0x1b : 0x00));
case V4L2_CID_BRIGHTNESS: return 0;
v4l2_ctrl_query_fill(qc, -128, 127, 1, 0); }
break;
case V4L2_CID_CONTRAST: static int vpx3220_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
v4l2_ctrl_query_fill(qc, 0, 63, 1, 32); {
break; switch (qc->id) {
case V4L2_CID_BRIGHTNESS:
v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
break;
case V4L2_CID_SATURATION: case V4L2_CID_CONTRAST:
v4l2_ctrl_query_fill(qc, 0, 4095, 1, 2048); v4l2_ctrl_query_fill(qc, 0, 63, 1, 32);
break; break;
case V4L2_CID_HUE: case V4L2_CID_SATURATION:
v4l2_ctrl_query_fill(qc, -512, 511, 1, 0); v4l2_ctrl_query_fill(qc, 0, 4095, 1, 2048);
break; break;
default: case V4L2_CID_HUE:
return -EINVAL; v4l2_ctrl_query_fill(qc, -512, 511, 1, 0);
}
break; break;
default:
return -EINVAL;
} }
return 0;
}
case VIDIOC_G_CTRL: static int vpx3220_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
{ {
struct v4l2_control *ctrl = arg; struct vpx3220 *decoder = to_vpx3220(sd);
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_BRIGHTNESS: case V4L2_CID_BRIGHTNESS:
ctrl->value = decoder->bright; ctrl->value = decoder->bright;
break; break;
case V4L2_CID_CONTRAST: case V4L2_CID_CONTRAST:
ctrl->value = decoder->contrast; ctrl->value = decoder->contrast;
break;
case V4L2_CID_SATURATION:
ctrl->value = decoder->sat;
break;
case V4L2_CID_HUE:
ctrl->value = decoder->hue;
break;
default:
return -EINVAL;
}
break; break;
case V4L2_CID_SATURATION:
ctrl->value = decoder->sat;
break;
case V4L2_CID_HUE:
ctrl->value = decoder->hue;
break;
default:
return -EINVAL;
} }
return 0;
}
case VIDIOC_S_CTRL: static int vpx3220_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
{ {
struct v4l2_control *ctrl = arg; struct vpx3220 *decoder = to_vpx3220(sd);
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_BRIGHTNESS: case V4L2_CID_BRIGHTNESS:
if (decoder->bright != ctrl->value) { if (decoder->bright != ctrl->value) {
decoder->bright = ctrl->value; decoder->bright = ctrl->value;
vpx3220_write(client, 0xe6, decoder->bright); vpx3220_write(sd, 0xe6, decoder->bright);
} }
break; break;
case V4L2_CID_CONTRAST: case V4L2_CID_CONTRAST:
if (decoder->contrast != ctrl->value) { if (decoder->contrast != ctrl->value) {
/* Bit 7 and 8 is for noise shaping */ /* Bit 7 and 8 is for noise shaping */
decoder->contrast = ctrl->value; decoder->contrast = ctrl->value;
vpx3220_write(client, 0xe7, vpx3220_write(sd, 0xe7, decoder->contrast + 192);
decoder->contrast + 192); }
} break;
break; case V4L2_CID_SATURATION:
case V4L2_CID_SATURATION: if (decoder->sat != ctrl->value) {
if (decoder->sat != ctrl->value) { decoder->sat = ctrl->value;
decoder->sat = ctrl->value; vpx3220_fp_write(sd, 0xa0, decoder->sat);
vpx3220_fp_write(client, 0xa0, decoder->sat); }
} break;
break; case V4L2_CID_HUE:
case V4L2_CID_HUE: if (decoder->hue != ctrl->value) {
if (decoder->hue != ctrl->value) { decoder->hue = ctrl->value;
decoder->hue = ctrl->value; vpx3220_fp_write(sd, 0x1c, decoder->hue);
vpx3220_fp_write(client, 0x1c, decoder->hue);
}
break;
default:
return -EINVAL;
} }
break; break;
}
default: default:
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
static int vpx3220_init_client(struct i2c_client *client) static int vpx3220_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
{ {
vpx3220_write_block(client, init_common, sizeof(init_common)); struct vpx3220 *decoder = to_vpx3220(sd);
vpx3220_write_fp_block(client, init_fp, sizeof(init_fp) >> 1); struct i2c_client *client = v4l2_get_subdevdata(sd);
/* Default to PAL */
vpx3220_write_fp_block(client, init_pal, sizeof(init_pal) >> 1);
return 0; return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);
} }
static int vpx3220_command(struct i2c_client *client, unsigned cmd, void *arg)
{
return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
}
/* ----------------------------------------------------------------------- */
static const struct v4l2_subdev_core_ops vpx3220_core_ops = {
.g_chip_ident = vpx3220_g_chip_ident,
.init = vpx3220_init,
.g_ctrl = vpx3220_g_ctrl,
.s_ctrl = vpx3220_s_ctrl,
.queryctrl = vpx3220_queryctrl,
};
static const struct v4l2_subdev_tuner_ops vpx3220_tuner_ops = {
.s_std = vpx3220_s_std,
};
static const struct v4l2_subdev_video_ops vpx3220_video_ops = {
.s_routing = vpx3220_s_routing,
.s_stream = vpx3220_s_stream,
.querystd = vpx3220_querystd,
.g_input_status = vpx3220_g_input_status,
};
static const struct v4l2_subdev_ops vpx3220_ops = {
.core = &vpx3220_core_ops,
.tuner = &vpx3220_tuner_ops,
.video = &vpx3220_video_ops,
};
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
* Client management code * Client management code
*/ */
static unsigned short normal_i2c[] = { 0x86 >> 1, 0x8e >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
static int vpx3220_probe(struct i2c_client *client, static int vpx3220_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct vpx3220 *decoder; struct vpx3220 *decoder;
struct v4l2_subdev *sd;
const char *name = NULL; const char *name = NULL;
u8 ver; u8 ver;
u16 pn; u16 pn;
...@@ -539,6 +564,8 @@ static int vpx3220_probe(struct i2c_client *client, ...@@ -539,6 +564,8 @@ static int vpx3220_probe(struct i2c_client *client,
decoder = kzalloc(sizeof(struct vpx3220), GFP_KERNEL); decoder = kzalloc(sizeof(struct vpx3220), GFP_KERNEL);
if (decoder == NULL) if (decoder == NULL)
return -ENOMEM; return -ENOMEM;
sd = &decoder->sd;
v4l2_i2c_subdev_init(sd, client, &vpx3220_ops);
decoder->norm = V4L2_STD_PAL; decoder->norm = V4L2_STD_PAL;
decoder->input = 0; decoder->input = 0;
decoder->enable = 1; decoder->enable = 1;
...@@ -546,11 +573,11 @@ static int vpx3220_probe(struct i2c_client *client, ...@@ -546,11 +573,11 @@ static int vpx3220_probe(struct i2c_client *client,
decoder->contrast = 32768; decoder->contrast = 32768;
decoder->hue = 32768; decoder->hue = 32768;
decoder->sat = 32768; decoder->sat = 32768;
i2c_set_clientdata(client, decoder);
ver = i2c_smbus_read_byte_data(client, 0x00); ver = i2c_smbus_read_byte_data(client, 0x00);
pn = (i2c_smbus_read_byte_data(client, 0x02) << 8) + pn = (i2c_smbus_read_byte_data(client, 0x02) << 8) +
i2c_smbus_read_byte_data(client, 0x01); i2c_smbus_read_byte_data(client, 0x01);
decoder->ident = V4L2_IDENT_VPX3220A;
if (ver == 0xec) { if (ver == 0xec) {
switch (pn) { switch (pn) {
case 0x4680: case 0x4680:
...@@ -558,26 +585,34 @@ static int vpx3220_probe(struct i2c_client *client, ...@@ -558,26 +585,34 @@ static int vpx3220_probe(struct i2c_client *client,
break; break;
case 0x4260: case 0x4260:
name = "vpx3216b"; name = "vpx3216b";
decoder->ident = V4L2_IDENT_VPX3216B;
break; break;
case 0x4280: case 0x4280:
name = "vpx3214c"; name = "vpx3214c";
decoder->ident = V4L2_IDENT_VPX3214C;
break; break;
} }
} }
if (name) if (name)
v4l_info(client, "%s found @ 0x%x (%s)\n", name, v4l2_info(sd, "%s found @ 0x%x (%s)\n", name,
client->addr << 1, client->adapter->name); client->addr << 1, client->adapter->name);
else else
v4l_info(client, "chip (%02x:%04x) found @ 0x%x (%s)\n", v4l2_info(sd, "chip (%02x:%04x) found @ 0x%x (%s)\n",
ver, pn, client->addr << 1, client->adapter->name); ver, pn, client->addr << 1, client->adapter->name);
vpx3220_init_client(client); vpx3220_write_block(sd, init_common, sizeof(init_common));
vpx3220_write_fp_block(sd, init_fp, sizeof(init_fp) >> 1);
/* Default to PAL */
vpx3220_write_fp_block(sd, init_pal, sizeof(init_pal) >> 1);
return 0; return 0;
} }
static int vpx3220_remove(struct i2c_client *client) static int vpx3220_remove(struct i2c_client *client)
{ {
kfree(i2c_get_clientdata(client)); struct v4l2_subdev *sd = i2c_get_clientdata(client);
v4l2_device_unregister_subdev(sd);
kfree(to_vpx3220(sd));
return 0; return 0;
} }
......
include/media/v4l2-chip-ident.h
浏览文件 @ 7e5eaadc
...@@ -88,6 +88,11 @@ enum { ...@@ -88,6 +88,11 @@ enum {
/* module vp27smpx: just ident 2700 */ /* module vp27smpx: just ident 2700 */
V4L2_IDENT_VP27SMPX = 2700, V4L2_IDENT_VP27SMPX = 2700,
/* module vpx3220: reserved range: 3210-3229 */
V4L2_IDENT_VPX3214C = 3214,
V4L2_IDENT_VPX3216B = 3216,
V4L2_IDENT_VPX3220A = 3220,
/* module tvp5150 */ /* module tvp5150 */
V4L2_IDENT_TVP5150 = 5150, V4L2_IDENT_TVP5150 = 5150,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或