Skip to content

L
linux
Commit 62ef80a1 authored by Muralidharan Karicheri's avatar Muralidharan Karicheri Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (12246): tvp514x: Migration to sub-device framework 

This patch converts TVP514x driver to sub-device framework
from V4L2-int framework.

[hverkuil@xs4all.nl: remove inline from the dump_reg function]
Signed-off-by: default avatarBrijesh Jadav <brijesh.j@ti.com>
Signed-off-by: default avatarHardik Shah <hardik.shah@ti.com>
Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6bcbc08f
Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 540 deletions
drivers/media/video/tvp514x.c
View file @ 62ef80a1
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <media/v4l2-int-device.h>
#include <media/v4l2-device.h>
#include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
#include <media/tvp514x.h> #include <media/tvp514x.h>
#include "tvp514x_regs.h" #include "tvp514x_regs.h"
...@@ -49,13 +52,11 @@ static int debug; ...@@ -49,13 +52,11 @@ static int debug;
module_param(debug, bool, 0644); module_param(debug, bool, 0644);
MODULE_PARM_DESC(debug, "Debug level (0-1)"); MODULE_PARM_DESC(debug, "Debug level (0-1)");
#define dump_reg(client, reg, val) \ MODULE_AUTHOR("Texas Instruments");
do { \ MODULE_DESCRIPTION("TVP514X linux decoder driver");
val = tvp514x_read_reg(client, reg); \ MODULE_LICENSE("GPL");
v4l_info(client, "Reg(0x%.2X): 0x%.2X\n", reg, val); \
} while (0)
/** /*
* enum tvp514x_std - enum for supported standards * enum tvp514x_std - enum for supported standards
*/ */
enum tvp514x_std { enum tvp514x_std {
...@@ -64,15 +65,7 @@ enum tvp514x_std { ...@@ -64,15 +65,7 @@ enum tvp514x_std {
STD_INVALID STD_INVALID
}; };
/** /*
* enum tvp514x_state - enum for different decoder states
*/
enum tvp514x_state {
STATE_NOT_DETECTED,
STATE_DETECTED
};
/**
* struct tvp514x_std_info - Structure to store standard informations * struct tvp514x_std_info - Structure to store standard informations
* @width: Line width in pixels * @width: Line width in pixels
* @height:Number of active lines * @height:Number of active lines
...@@ -87,35 +80,29 @@ struct tvp514x_std_info { ...@@ -87,35 +80,29 @@ struct tvp514x_std_info {
}; };
static struct tvp514x_reg tvp514x_reg_list_default[0x40]; static struct tvp514x_reg tvp514x_reg_list_default[0x40];
/** /*
* struct tvp514x_decoder - TVP5146/47 decoder object * struct tvp514x_decoder - TVP5146/47 decoder object
* @v4l2_int_device: Slave handle * @sd: Subdevice Slave handle
* @tvp514x_slave: Slave pointer which is used by @v4l2_int_device
* @tvp514x_regs: copy of hw's regs with preset values. * @tvp514x_regs: copy of hw's regs with preset values.
* @pdata: Board specific * @pdata: Board specific
* @client: I2C client data
* @id: Entry from I2C table
* @ver: Chip version * @ver: Chip version
* @state: TVP5146/47 decoder state - detected or not-detected * @streaming: TVP5146/47 decoder streaming - enabled or disabled.
* @pix: Current pixel format * @pix: Current pixel format
* @num_fmts: Number of formats * @num_fmts: Number of formats
* @fmt_list: Format list * @fmt_list: Format list
* @current_std: Current standard * @current_std: Current standard
* @num_stds: Number of standards * @num_stds: Number of standards
* @std_list: Standards list * @std_list: Standards list
* @route: input and output routing at chip level * @input: Input routing at chip level
* @output: Output routing at chip level
*/ */
struct tvp514x_decoder { struct tvp514x_decoder {
struct v4l2_int_device v4l2_int_device; struct v4l2_subdev sd;
struct v4l2_int_slave tvp514x_slave;
struct tvp514x_reg tvp514x_regs[ARRAY_SIZE(tvp514x_reg_list_default)]; struct tvp514x_reg tvp514x_regs[ARRAY_SIZE(tvp514x_reg_list_default)];
const struct tvp514x_platform_data *pdata; const struct tvp514x_platform_data *pdata;
struct i2c_client *client;
struct i2c_device_id *id;
int ver; int ver;
enum tvp514x_state state; int streaming;
struct v4l2_pix_format pix; struct v4l2_pix_format pix;
int num_fmts; int num_fmts;
...@@ -124,8 +111,11 @@ struct tvp514x_decoder { ...@@ -124,8 +111,11 @@ struct tvp514x_decoder {
enum tvp514x_std current_std; enum tvp514x_std current_std;
int num_stds; int num_stds;
struct tvp514x_std_info *std_list; struct tvp514x_std_info *std_list;
/*
struct v4l2_routing route; * Input and Output Routing parameters
*/
u32 input;
u32 output;
}; };
/* TVP514x default register values */ /* TVP514x default register values */
...@@ -191,7 +181,8 @@ static struct tvp514x_reg tvp514x_reg_list_default[] = { ...@@ -191,7 +181,8 @@ static struct tvp514x_reg tvp514x_reg_list_default[] = {
{TOK_TERM, 0, 0}, {TOK_TERM, 0, 0},
}; };
/* List of image formats supported by TVP5146/47 decoder /*
* List of image formats supported by TVP5146/47 decoder
* Currently we are using 8 bit mode only, but can be * Currently we are using 8 bit mode only, but can be
* extended to 10/20 bit mode. * extended to 10/20 bit mode.
*/ */
...@@ -240,35 +231,29 @@ static struct tvp514x_std_info tvp514x_std_list[] = { ...@@ -240,35 +231,29 @@ static struct tvp514x_std_info tvp514x_std_list[] = {
}, },
/* Standard: need to add for additional standard */ /* Standard: need to add for additional standard */
}; };
/*
* Control structure for Auto Gain
* This is temporary data, will get replaced once static inline struct tvp514x_decoder *to_decoder(struct v4l2_subdev *sd)
* v4l2_ctrl_query_fill supports it. {
*/ return container_of(sd, struct tvp514x_decoder, sd);
static const struct v4l2_queryctrl tvp514x_autogain_ctrl = { }
.id = V4L2_CID_AUTOGAIN,
.name = "Gain, Automatic",
.type = V4L2_CTRL_TYPE_BOOLEAN,
.minimum = 0,
.maximum = 1,
.step = 1,
.default_value = 1,
};
/* /*
* Read a value from a register in an TVP5146/47 decoder device. * Read a value from a register in an TVP5146/47 decoder device.
* Returns value read if successful, or non-zero (-1) otherwise. * Returns value read if successful, or non-zero (-1) otherwise.
*/ */
static int tvp514x_read_reg(struct i2c_client *client, u8 reg) static int tvp514x_read_reg(struct v4l2_subdev *sd, u8 reg)
{ {
int err; int err, retry = 0;
int retry = 0; struct i2c_client *client = v4l2_get_subdevdata(sd);
read_again: read_again:
err = i2c_smbus_read_byte_data(client, reg); err = i2c_smbus_read_byte_data(client, reg);
if (err == -1) { if (err == -1) {
if (retry <= I2C_RETRY_COUNT) { if (retry <= I2C_RETRY_COUNT) {
v4l_warn(client, "Read: retry ... %d\n", retry); v4l2_warn(sd, "Read: retry ... %d\n", retry);
retry++; retry++;
msleep_interruptible(10); msleep_interruptible(10);
goto read_again; goto read_again;
...@@ -278,20 +263,29 @@ static int tvp514x_read_reg(struct i2c_client *client, u8 reg) ...@@ -278,20 +263,29 @@ static int tvp514x_read_reg(struct i2c_client *client, u8 reg)
return err; return err;
} }
static void dump_reg(struct v4l2_subdev *sd, u8 reg)
{
u32 val;
val = tvp514x_read_reg(sd, reg);
v4l2_info(sd, "Reg(0x%.2X): 0x%.2X\n", reg, val);
}
/* /*
* Write a value to a register in an TVP5146/47 decoder device. * Write a value to a register in an TVP5146/47 decoder device.
* Returns zero if successful, or non-zero otherwise. * Returns zero if successful, or non-zero otherwise.
*/ */
static int tvp514x_write_reg(struct i2c_client *client, u8 reg, u8 val) static int tvp514x_write_reg(struct v4l2_subdev *sd, u8 reg, u8 val)
{ {
int err; int err, retry = 0;
int retry = 0; struct i2c_client *client = v4l2_get_subdevdata(sd);
write_again: write_again:
err = i2c_smbus_write_byte_data(client, reg, val); err = i2c_smbus_write_byte_data(client, reg, val);
if (err) { if (err) {
if (retry <= I2C_RETRY_COUNT) { if (retry <= I2C_RETRY_COUNT) {
v4l_warn(client, "Write: retry ... %d\n", retry); v4l2_warn(sd, "Write: retry ... %d\n", retry);
retry++; retry++;
msleep_interruptible(10); msleep_interruptible(10);
goto write_again; goto write_again;
...@@ -311,7 +305,7 @@ static int tvp514x_write_reg(struct i2c_client *client, u8 reg, u8 val) ...@@ -311,7 +305,7 @@ static int tvp514x_write_reg(struct i2c_client *client, u8 reg, u8 val)
* reglist - list of registers to be written * reglist - list of registers to be written
* Returns zero if successful, or non-zero otherwise. * Returns zero if successful, or non-zero otherwise.
*/ */
static int tvp514x_write_regs(struct i2c_client *client, static int tvp514x_write_regs(struct v4l2_subdev *sd,
const struct tvp514x_reg reglist[]) const struct tvp514x_reg reglist[])
{ {
int err; int err;
...@@ -326,9 +320,9 @@ static int tvp514x_write_regs(struct i2c_client *client, ...@@ -326,9 +320,9 @@ static int tvp514x_write_regs(struct i2c_client *client,
if (next->token == TOK_SKIP) if (next->token == TOK_SKIP)
continue; continue;
err = tvp514x_write_reg(client, next->reg, (u8) next->val); err = tvp514x_write_reg(sd, next->reg, (u8) next->val);
if (err) { if (err) {
v4l_err(client, "Write failed. Err[%d]\n", err); v4l2_err(sd, "Write failed. Err[%d]\n", err);
return err; return err;
} }
} }
...@@ -339,17 +333,15 @@ static int tvp514x_write_regs(struct i2c_client *client, ...@@ -339,17 +333,15 @@ static int tvp514x_write_regs(struct i2c_client *client,
* tvp514x_get_current_std: * tvp514x_get_current_std:
* Returns the current standard detected by TVP5146/47 * Returns the current standard detected by TVP5146/47
*/ */
static enum tvp514x_std tvp514x_get_current_std(struct tvp514x_decoder static enum tvp514x_std tvp514x_get_current_std(struct v4l2_subdev *sd)
*decoder)
{ {
u8 std, std_status; u8 std, std_status;
std = tvp514x_read_reg(decoder->client, REG_VIDEO_STD); std = tvp514x_read_reg(sd, REG_VIDEO_STD);
if ((std & VIDEO_STD_MASK) == VIDEO_STD_AUTO_SWITCH_BIT) { if ((std & VIDEO_STD_MASK) == VIDEO_STD_AUTO_SWITCH_BIT)
/* use the standard status register */ /* use the standard status register */
std_status = tvp514x_read_reg(decoder->client, std_status = tvp514x_read_reg(sd, REG_VIDEO_STD_STATUS);
REG_VIDEO_STD_STATUS); else
} else
std_status = std; /* use the standard register itself */ std_status = std; /* use the standard register itself */
switch (std_status & VIDEO_STD_MASK) { switch (std_status & VIDEO_STD_MASK) {
...@@ -369,70 +361,69 @@ static enum tvp514x_std tvp514x_get_current_std(struct tvp514x_decoder ...@@ -369,70 +361,69 @@ static enum tvp514x_std tvp514x_get_current_std(struct tvp514x_decoder
/* /*
* TVP5146/47 register dump function * TVP5146/47 register dump function
*/ */
static void tvp514x_reg_dump(struct tvp514x_decoder *decoder) static void tvp514x_reg_dump(struct v4l2_subdev *sd)
{ {
u8 value; dump_reg(sd, REG_INPUT_SEL);
dump_reg(sd, REG_AFE_GAIN_CTRL);
dump_reg(decoder->client, REG_INPUT_SEL, value); dump_reg(sd, REG_VIDEO_STD);
dump_reg(decoder->client, REG_AFE_GAIN_CTRL, value); dump_reg(sd, REG_OPERATION_MODE);
dump_reg(decoder->client, REG_VIDEO_STD, value); dump_reg(sd, REG_COLOR_KILLER);
dump_reg(decoder->client, REG_OPERATION_MODE, value); dump_reg(sd, REG_LUMA_CONTROL1);
dump_reg(decoder->client, REG_COLOR_KILLER, value); dump_reg(sd, REG_LUMA_CONTROL2);
dump_reg(decoder->client, REG_LUMA_CONTROL1, value); dump_reg(sd, REG_LUMA_CONTROL3);
dump_reg(decoder->client, REG_LUMA_CONTROL2, value); dump_reg(sd, REG_BRIGHTNESS);
dump_reg(decoder->client, REG_LUMA_CONTROL3, value); dump_reg(sd, REG_CONTRAST);
dump_reg(decoder->client, REG_BRIGHTNESS, value); dump_reg(sd, REG_SATURATION);
dump_reg(decoder->client, REG_CONTRAST, value); dump_reg(sd, REG_HUE);
dump_reg(decoder->client, REG_SATURATION, value); dump_reg(sd, REG_CHROMA_CONTROL1);
dump_reg(decoder->client, REG_HUE, value); dump_reg(sd, REG_CHROMA_CONTROL2);
dump_reg(decoder->client, REG_CHROMA_CONTROL1, value); dump_reg(sd, REG_COMP_PR_SATURATION);
dump_reg(decoder->client, REG_CHROMA_CONTROL2, value); dump_reg(sd, REG_COMP_Y_CONTRAST);
dump_reg(decoder->client, REG_COMP_PR_SATURATION, value); dump_reg(sd, REG_COMP_PB_SATURATION);
dump_reg(decoder->client, REG_COMP_Y_CONTRAST, value); dump_reg(sd, REG_COMP_Y_BRIGHTNESS);
dump_reg(decoder->client, REG_COMP_PB_SATURATION, value); dump_reg(sd, REG_AVID_START_PIXEL_LSB);
dump_reg(decoder->client, REG_COMP_Y_BRIGHTNESS, value); dump_reg(sd, REG_AVID_START_PIXEL_MSB);
dump_reg(decoder->client, REG_AVID_START_PIXEL_LSB, value); dump_reg(sd, REG_AVID_STOP_PIXEL_LSB);
dump_reg(decoder->client, REG_AVID_START_PIXEL_MSB, value); dump_reg(sd, REG_AVID_STOP_PIXEL_MSB);
dump_reg(decoder->client, REG_AVID_STOP_PIXEL_LSB, value); dump_reg(sd, REG_HSYNC_START_PIXEL_LSB);
dump_reg(decoder->client, REG_AVID_STOP_PIXEL_MSB, value); dump_reg(sd, REG_HSYNC_START_PIXEL_MSB);
dump_reg(decoder->client, REG_HSYNC_START_PIXEL_LSB, value); dump_reg(sd, REG_HSYNC_STOP_PIXEL_LSB);
dump_reg(decoder->client, REG_HSYNC_START_PIXEL_MSB, value); dump_reg(sd, REG_HSYNC_STOP_PIXEL_MSB);
dump_reg(decoder->client, REG_HSYNC_STOP_PIXEL_LSB, value); dump_reg(sd, REG_VSYNC_START_LINE_LSB);
dump_reg(decoder->client, REG_HSYNC_STOP_PIXEL_MSB, value); dump_reg(sd, REG_VSYNC_START_LINE_MSB);
dump_reg(decoder->client, REG_VSYNC_START_LINE_LSB, value); dump_reg(sd, REG_VSYNC_STOP_LINE_LSB);
dump_reg(decoder->client, REG_VSYNC_START_LINE_MSB, value); dump_reg(sd, REG_VSYNC_STOP_LINE_MSB);
dump_reg(decoder->client, REG_VSYNC_STOP_LINE_LSB, value); dump_reg(sd, REG_VBLK_START_LINE_LSB);
dump_reg(decoder->client, REG_VSYNC_STOP_LINE_MSB, value); dump_reg(sd, REG_VBLK_START_LINE_MSB);
dump_reg(decoder->client, REG_VBLK_START_LINE_LSB, value); dump_reg(sd, REG_VBLK_STOP_LINE_LSB);
dump_reg(decoder->client, REG_VBLK_START_LINE_MSB, value); dump_reg(sd, REG_VBLK_STOP_LINE_MSB);
dump_reg(decoder->client, REG_VBLK_STOP_LINE_LSB, value); dump_reg(sd, REG_SYNC_CONTROL);
dump_reg(decoder->client, REG_VBLK_STOP_LINE_MSB, value); dump_reg(sd, REG_OUTPUT_FORMATTER1);
dump_reg(decoder->client, REG_SYNC_CONTROL, value); dump_reg(sd, REG_OUTPUT_FORMATTER2);
dump_reg(decoder->client, REG_OUTPUT_FORMATTER1, value); dump_reg(sd, REG_OUTPUT_FORMATTER3);
dump_reg(decoder->client, REG_OUTPUT_FORMATTER2, value); dump_reg(sd, REG_OUTPUT_FORMATTER4);
dump_reg(decoder->client, REG_OUTPUT_FORMATTER3, value); dump_reg(sd, REG_OUTPUT_FORMATTER5);
dump_reg(decoder->client, REG_OUTPUT_FORMATTER4, value); dump_reg(sd, REG_OUTPUT_FORMATTER6);
dump_reg(decoder->client, REG_OUTPUT_FORMATTER5, value); dump_reg(sd, REG_CLEAR_LOST_LOCK);
dump_reg(decoder->client, REG_OUTPUT_FORMATTER6, value);
dump_reg(decoder->client, REG_CLEAR_LOST_LOCK, value);
} }
/* /*
* Configure the TVP5146/47 with the current register settings * Configure the TVP5146/47 with the current register settings
* Returns zero if successful, or non-zero otherwise. * Returns zero if successful, or non-zero otherwise.
*/ */
static int tvp514x_configure(struct tvp514x_decoder *decoder) static int tvp514x_configure(struct v4l2_subdev *sd,
struct tvp514x_decoder *decoder)
{ {
int err; int err;
/* common register initialization */ /* common register initialization */
err = err =
tvp514x_write_regs(decoder->client, decoder->tvp514x_regs); tvp514x_write_regs(sd, decoder->tvp514x_regs);
if (err) if (err)
return err; return err;
if (debug) if (debug)
tvp514x_reg_dump(decoder); tvp514x_reg_dump(sd);
return 0; return 0;
} }
...@@ -445,15 +436,17 @@ static int tvp514x_configure(struct tvp514x_decoder *decoder) ...@@ -445,15 +436,17 @@ static int tvp514x_configure(struct tvp514x_decoder *decoder)
* Returns ENODEV error number if no device is detected, or zero * Returns ENODEV error number if no device is detected, or zero
* if a device is detected. * if a device is detected.
*/ */
static int tvp514x_detect(struct tvp514x_decoder *decoder) static int tvp514x_detect(struct v4l2_subdev *sd,
struct tvp514x_decoder *decoder)
{ {
u8 chip_id_msb, chip_id_lsb, rom_ver; u8 chip_id_msb, chip_id_lsb, rom_ver;
struct i2c_client *client = v4l2_get_subdevdata(sd);
chip_id_msb = tvp514x_read_reg(decoder->client, REG_CHIP_ID_MSB); chip_id_msb = tvp514x_read_reg(sd, REG_CHIP_ID_MSB);
chip_id_lsb = tvp514x_read_reg(decoder->client, REG_CHIP_ID_LSB); chip_id_lsb = tvp514x_read_reg(sd, REG_CHIP_ID_LSB);
rom_ver = tvp514x_read_reg(decoder->client, REG_ROM_VERSION); rom_ver = tvp514x_read_reg(sd, REG_ROM_VERSION);
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd,
"chip id detected msb:0x%x lsb:0x%x rom version:0x%x\n", "chip id detected msb:0x%x lsb:0x%x rom version:0x%x\n",
chip_id_msb, chip_id_lsb, rom_ver); chip_id_msb, chip_id_lsb, rom_ver);
if ((chip_id_msb != TVP514X_CHIP_ID_MSB) if ((chip_id_msb != TVP514X_CHIP_ID_MSB)
...@@ -462,19 +455,16 @@ static int tvp514x_detect(struct tvp514x_decoder *decoder) ...@@ -462,19 +455,16 @@ static int tvp514x_detect(struct tvp514x_decoder *decoder)
/* We didn't read the values we expected, so this must not be /* We didn't read the values we expected, so this must not be
* an TVP5146/47. * an TVP5146/47.
*/ */
v4l_err(decoder->client, v4l2_err(sd, "chip id mismatch msb:0x%x lsb:0x%x\n",
"chip id mismatch msb:0x%x lsb:0x%x\n", chip_id_msb, chip_id_lsb);
chip_id_msb, chip_id_lsb);
return -ENODEV; return -ENODEV;
} }
decoder->ver = rom_ver; decoder->ver = rom_ver;
decoder->state = STATE_DETECTED;
v4l_info(decoder->client, v4l2_info(sd, "%s (Version - 0x%.2x) found at 0x%x (%s)\n",
"%s found at 0x%x (%s)\n", decoder->client->name, client->name, decoder->ver,
decoder->client->addr << 1, client->addr << 1, client->adapter->name);
decoder->client->adapter->name);
return 0; return 0;
} }
...@@ -483,17 +473,17 @@ static int tvp514x_detect(struct tvp514x_decoder *decoder) ...@@ -483,17 +473,17 @@ static int tvp514x_detect(struct tvp514x_decoder *decoder)
* TVP5146/47 decoder driver. * TVP5146/47 decoder driver.
*/ */
/** /*
* ioctl_querystd - V4L2 decoder interface handler for VIDIOC_QUERYSTD ioctl * tvp514x_querystd - V4L2 decoder interface handler for VIDIOC_QUERYSTD ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @std_id: standard V4L2 std_id ioctl enum * @std_id: standard V4L2 std_id ioctl enum
* *
* Returns the current standard detected by TVP5146/47. If no active input is * Returns the current standard detected by TVP5146/47. If no active input is
* detected, returns -EINVAL * detected, returns -EINVAL
*/ */
static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id) static int tvp514x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
enum tvp514x_std current_std; enum tvp514x_std current_std;
enum tvp514x_input input_sel; enum tvp514x_input input_sel;
u8 sync_lock_status, lock_mask; u8 sync_lock_status, lock_mask;
...@@ -502,11 +492,11 @@ static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id) ...@@ -502,11 +492,11 @@ static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id)
return -EINVAL; return -EINVAL;
/* get the current standard */ /* get the current standard */
current_std = tvp514x_get_current_std(decoder); current_std = tvp514x_get_current_std(sd);
if (current_std == STD_INVALID) if (current_std == STD_INVALID)
return -EINVAL; return -EINVAL;
input_sel = decoder->route.input; input_sel = decoder->input;
switch (input_sel) { switch (input_sel) {
case INPUT_CVBS_VI1A: case INPUT_CVBS_VI1A:
...@@ -544,42 +534,39 @@ static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id) ...@@ -544,42 +534,39 @@ static int ioctl_querystd(struct v4l2_int_device *s, v4l2_std_id *std_id)
return -EINVAL; return -EINVAL;
} }
/* check whether signal is locked */ /* check whether signal is locked */
sync_lock_status = tvp514x_read_reg(decoder->client, REG_STATUS1); sync_lock_status = tvp514x_read_reg(sd, REG_STATUS1);
if (lock_mask != (sync_lock_status & lock_mask)) if (lock_mask != (sync_lock_status & lock_mask))
return -EINVAL; /* No input detected */ return -EINVAL; /* No input detected */
decoder->current_std = current_std; decoder->current_std = current_std;
*std_id = decoder->std_list[current_std].standard.id; *std_id = decoder->std_list[current_std].standard.id;
v4l_dbg(1, debug, decoder->client, "Current STD: %s", v4l2_dbg(1, debug, sd, "Current STD: %s",
decoder->std_list[current_std].standard.name); decoder->std_list[current_std].standard.name);
return 0; return 0;
} }
/** /*
* ioctl_s_std - V4L2 decoder interface handler for VIDIOC_S_STD ioctl * tvp514x_s_std - V4L2 decoder interface handler for VIDIOC_S_STD ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @std_id: standard V4L2 v4l2_std_id ioctl enum * @std_id: standard V4L2 v4l2_std_id ioctl enum
* *
* If std_id is supported, sets the requested standard. Otherwise, returns * If std_id is supported, sets the requested standard. Otherwise, returns
* -EINVAL * -EINVAL
*/ */
static int ioctl_s_std(struct v4l2_int_device *s, v4l2_std_id *std_id) static int tvp514x_s_std(struct v4l2_subdev *sd, v4l2_std_id std_id)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
int err, i; int err, i;
if (std_id == NULL)
return -EINVAL;
for (i = 0; i < decoder->num_stds; i++) for (i = 0; i < decoder->num_stds; i++)
if (*std_id & decoder->std_list[i].standard.id) if (std_id & decoder->std_list[i].standard.id)
break; break;
if ((i == decoder->num_stds) || (i == STD_INVALID)) if ((i == decoder->num_stds) || (i == STD_INVALID))
return -EINVAL; return -EINVAL;
err = tvp514x_write_reg(decoder->client, REG_VIDEO_STD, err = tvp514x_write_reg(sd, REG_VIDEO_STD,
decoder->std_list[i].video_std); decoder->std_list[i].video_std);
if (err) if (err)
return err; return err;
...@@ -588,24 +575,24 @@ static int ioctl_s_std(struct v4l2_int_device *s, v4l2_std_id *std_id) ...@@ -588,24 +575,24 @@ static int ioctl_s_std(struct v4l2_int_device *s, v4l2_std_id *std_id)
decoder->tvp514x_regs[REG_VIDEO_STD].val = decoder->tvp514x_regs[REG_VIDEO_STD].val =
decoder->std_list[i].video_std; decoder->std_list[i].video_std;
v4l_dbg(1, debug, decoder->client, "Standard set to: %s", v4l2_dbg(1, debug, sd, "Standard set to: %s",
decoder->std_list[i].standard.name); decoder->std_list[i].standard.name);
return 0; return 0;
} }
/** /*
* ioctl_s_routing - V4L2 decoder interface handler for VIDIOC_S_INPUT ioctl * tvp514x_s_routing - V4L2 decoder interface handler for VIDIOC_S_INPUT ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @index: number of the input * @index: number of the input
* *
* If index is valid, selects the requested input. Otherwise, returns -EINVAL if * If index is valid, selects the requested input. Otherwise, returns -EINVAL if
* the input is not supported or there is no active signal present in the * the input is not supported or there is no active signal present in the
* selected input. * selected input.
*/ */
static int ioctl_s_routing(struct v4l2_int_device *s, static int tvp514x_s_routing(struct v4l2_subdev *sd,
struct v4l2_routing *route) u32 input, u32 output, u32 config)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
int err; int err;
enum tvp514x_input input_sel; enum tvp514x_input input_sel;
enum tvp514x_output output_sel; enum tvp514x_output output_sel;
...@@ -613,20 +600,20 @@ static int ioctl_s_routing(struct v4l2_int_device *s, ...@@ -613,20 +600,20 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
u8 sync_lock_status, lock_mask; u8 sync_lock_status, lock_mask;
int try_count = LOCK_RETRY_COUNT; int try_count = LOCK_RETRY_COUNT;
if ((!route) || (route->input >= INPUT_INVALID) || if ((input >= INPUT_INVALID) ||
(route->output >= OUTPUT_INVALID)) (output >= OUTPUT_INVALID))
return -EINVAL; /* Index out of bound */ return -EINVAL; /* Index out of bound */
input_sel = route->input; input_sel = input;
output_sel = route->output; output_sel = output;
err = tvp514x_write_reg(decoder->client, REG_INPUT_SEL, input_sel); err = tvp514x_write_reg(sd, REG_INPUT_SEL, input_sel);
if (err) if (err)
return err; return err;
output_sel |= tvp514x_read_reg(decoder->client, output_sel |= tvp514x_read_reg(sd,
REG_OUTPUT_FORMATTER1) & 0x7; REG_OUTPUT_FORMATTER1) & 0x7;
err = tvp514x_write_reg(decoder->client, REG_OUTPUT_FORMATTER1, err = tvp514x_write_reg(sd, REG_OUTPUT_FORMATTER1,
output_sel); output_sel);
if (err) if (err)
return err; return err;
...@@ -637,7 +624,7 @@ static int ioctl_s_routing(struct v4l2_int_device *s, ...@@ -637,7 +624,7 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
/* Clear status */ /* Clear status */
msleep(LOCK_RETRY_DELAY); msleep(LOCK_RETRY_DELAY);
err = err =
tvp514x_write_reg(decoder->client, REG_CLEAR_LOST_LOCK, 0x01); tvp514x_write_reg(sd, REG_CLEAR_LOST_LOCK, 0x01);
if (err) if (err)
return err; return err;
...@@ -682,11 +669,11 @@ static int ioctl_s_routing(struct v4l2_int_device *s, ...@@ -682,11 +669,11 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
msleep(LOCK_RETRY_DELAY); msleep(LOCK_RETRY_DELAY);
/* get the current standard for future reference */ /* get the current standard for future reference */
current_std = tvp514x_get_current_std(decoder); current_std = tvp514x_get_current_std(sd);
if (current_std == STD_INVALID) if (current_std == STD_INVALID)
continue; continue;
sync_lock_status = tvp514x_read_reg(decoder->client, sync_lock_status = tvp514x_read_reg(sd,
REG_STATUS1); REG_STATUS1);
if (lock_mask == (sync_lock_status & lock_mask)) if (lock_mask == (sync_lock_status & lock_mask))
break; /* Input detected */ break; /* Input detected */
...@@ -696,28 +683,26 @@ static int ioctl_s_routing(struct v4l2_int_device *s, ...@@ -696,28 +683,26 @@ static int ioctl_s_routing(struct v4l2_int_device *s,
return -EINVAL; return -EINVAL;
decoder->current_std = current_std; decoder->current_std = current_std;
decoder->route.input = route->input; decoder->input = input;
decoder->route.output = route->output; decoder->output = output;
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Input set to: %d, std : %d",
"Input set to: %d, std : %d",
input_sel, current_std); input_sel, current_std);
return 0; return 0;
} }
/** /*
* ioctl_queryctrl - V4L2 decoder interface handler for VIDIOC_QUERYCTRL ioctl * tvp514x_queryctrl - V4L2 decoder interface handler for VIDIOC_QUERYCTRL ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @qctrl: standard V4L2 v4l2_queryctrl structure * @qctrl: standard V4L2 v4l2_queryctrl structure
* *
* If the requested control is supported, returns the control information. * If the requested control is supported, returns the control information.
* Otherwise, returns -EINVAL if the control is not supported. * Otherwise, returns -EINVAL if the control is not supported.
*/ */
static int static int
ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl) tvp514x_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qctrl)
{ {
struct tvp514x_decoder *decoder = s->priv;
int err = -EINVAL; int err = -EINVAL;
if (qctrl == NULL) if (qctrl == NULL)
...@@ -744,30 +729,27 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl) ...@@ -744,30 +729,27 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl)
err = v4l2_ctrl_query_fill(qctrl, -180, 180, 180, 0); err = v4l2_ctrl_query_fill(qctrl, -180, 180, 180, 0);
break; break;
case V4L2_CID_AUTOGAIN: case V4L2_CID_AUTOGAIN:
/* Autogain is either 0 or 1*/ /*
memcpy(qctrl, &tvp514x_autogain_ctrl, * Auto Gain supported is -
sizeof(struct v4l2_queryctrl)); * 0 - 1 (Default - 1)
err = 0; */
err = v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 1);
break; break;
default: default:
v4l_err(decoder->client, v4l2_err(sd, "invalid control id %d\n", qctrl->id);
"invalid control id %d\n", qctrl->id);
return err; return err;
} }
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Query Control:%s: Min - %d, Max - %d, Def - %d",
"Query Control: %s : Min - %d, Max - %d, Def - %d", qctrl->name, qctrl->minimum, qctrl->maximum,
qctrl->name,
qctrl->minimum,
qctrl->maximum,
qctrl->default_value); qctrl->default_value);
return err; return err;
} }
/** /*
* ioctl_g_ctrl - V4L2 decoder interface handler for VIDIOC_G_CTRL ioctl * tvp514x_g_ctrl - V4L2 decoder interface handler for VIDIOC_G_CTRL ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @ctrl: pointer to v4l2_control structure * @ctrl: pointer to v4l2_control structure
* *
* If the requested control is supported, returns the control's current * If the requested control is supported, returns the control's current
...@@ -775,9 +757,9 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl) ...@@ -775,9 +757,9 @@ ioctl_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qctrl)
* supported. * supported.
*/ */
static int static int
ioctl_g_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl) tvp514x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
if (ctrl == NULL) if (ctrl == NULL)
return -EINVAL; return -EINVAL;
...@@ -811,74 +793,70 @@ ioctl_g_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl) ...@@ -811,74 +793,70 @@ ioctl_g_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
break; break;
default: default:
v4l_err(decoder->client, v4l2_err(sd, "invalid control id %d\n", ctrl->id);
"invalid control id %d\n", ctrl->id);
return -EINVAL; return -EINVAL;
} }
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Get Control: ID - %d - %d",
"Get Control: ID - %d - %d",
ctrl->id, ctrl->value); ctrl->id, ctrl->value);
return 0; return 0;
} }
/** /*
* ioctl_s_ctrl - V4L2 decoder interface handler for VIDIOC_S_CTRL ioctl * tvp514x_s_ctrl - V4L2 decoder interface handler for VIDIOC_S_CTRL ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @ctrl: pointer to v4l2_control structure * @ctrl: pointer to v4l2_control structure
* *
* If the requested control is supported, sets the control's current * If the requested control is supported, sets the control's current
* value in HW. Otherwise, returns -EINVAL if the control is not supported. * value in HW. Otherwise, returns -EINVAL if the control is not supported.
*/ */
static int static int
ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl) tvp514x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
int err = -EINVAL, value; int err = -EINVAL, value;
if (ctrl == NULL) if (ctrl == NULL)
return err; return err;
value = (__s32) ctrl->value; value = ctrl->value;
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_BRIGHTNESS: case V4L2_CID_BRIGHTNESS:
if (ctrl->value < 0 || ctrl->value > 255) { if (ctrl->value < 0 || ctrl->value > 255) {
v4l_err(decoder->client, v4l2_err(sd, "invalid brightness setting %d\n",
"invalid brightness setting %d\n",
ctrl->value); ctrl->value);
return -ERANGE; return -ERANGE;
} }
err = tvp514x_write_reg(decoder->client, REG_BRIGHTNESS, err = tvp514x_write_reg(sd, REG_BRIGHTNESS,
value); value);
if (err) if (err)
return err; return err;
decoder->tvp514x_regs[REG_BRIGHTNESS].val = value; decoder->tvp514x_regs[REG_BRIGHTNESS].val = value;
break; break;
case V4L2_CID_CONTRAST: case V4L2_CID_CONTRAST:
if (ctrl->value < 0 || ctrl->value > 255) { if (ctrl->value < 0 || ctrl->value > 255) {
v4l_err(decoder->client, v4l2_err(sd, "invalid contrast setting %d\n",
"invalid contrast setting %d\n",
ctrl->value); ctrl->value);
return -ERANGE; return -ERANGE;
} }
err = tvp514x_write_reg(decoder->client, REG_CONTRAST, err = tvp514x_write_reg(sd, REG_CONTRAST, value);
value);
if (err) if (err)
return err; return err;
decoder->tvp514x_regs[REG_CONTRAST].val = value; decoder->tvp514x_regs[REG_CONTRAST].val = value;
break; break;
case V4L2_CID_SATURATION: case V4L2_CID_SATURATION:
if (ctrl->value < 0 || ctrl->value > 255) { if (ctrl->value < 0 || ctrl->value > 255) {
v4l_err(decoder->client, v4l2_err(sd, "invalid saturation setting %d\n",
"invalid saturation setting %d\n",
ctrl->value); ctrl->value);
return -ERANGE; return -ERANGE;
} }
err = tvp514x_write_reg(decoder->client, REG_SATURATION, err = tvp514x_write_reg(sd, REG_SATURATION, value);
value);
if (err) if (err)
return err; return err;
decoder->tvp514x_regs[REG_SATURATION].val = value; decoder->tvp514x_regs[REG_SATURATION].val = value;
break; break;
case V4L2_CID_HUE: case V4L2_CID_HUE:
...@@ -889,15 +867,13 @@ ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl) ...@@ -889,15 +867,13 @@ ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
else if (value == 0) else if (value == 0)
value = 0; value = 0;
else { else {
v4l_err(decoder->client, v4l2_err(sd, "invalid hue setting %d\n", ctrl->value);
"invalid hue setting %d\n",
ctrl->value);
return -ERANGE; return -ERANGE;
} }
err = tvp514x_write_reg(decoder->client, REG_HUE, err = tvp514x_write_reg(sd, REG_HUE, value);
value);
if (err) if (err)
return err; return err;
decoder->tvp514x_regs[REG_HUE].val = value; decoder->tvp514x_regs[REG_HUE].val = value;
break; break;
case V4L2_CID_AUTOGAIN: case V4L2_CID_AUTOGAIN:
...@@ -906,41 +882,38 @@ ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl) ...@@ -906,41 +882,38 @@ ioctl_s_ctrl(struct v4l2_int_device *s, struct v4l2_control *ctrl)
else if (value == 0) else if (value == 0)
value = 0x0C; value = 0x0C;
else { else {
v4l_err(decoder->client, v4l2_err(sd, "invalid auto gain setting %d\n",
"invalid auto gain setting %d\n",
ctrl->value); ctrl->value);
return -ERANGE; return -ERANGE;
} }
err = tvp514x_write_reg(decoder->client, REG_AFE_GAIN_CTRL, err = tvp514x_write_reg(sd, REG_AFE_GAIN_CTRL, value);
value);
if (err) if (err)
return err; return err;
decoder->tvp514x_regs[REG_AFE_GAIN_CTRL].val = value; decoder->tvp514x_regs[REG_AFE_GAIN_CTRL].val = value;
break; break;
default: default:
v4l_err(decoder->client, v4l2_err(sd, "invalid control id %d\n", ctrl->id);
"invalid control id %d\n", ctrl->id);
return err; return err;
} }
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Set Control: ID - %d - %d",
"Set Control: ID - %d - %d",
ctrl->id, ctrl->value); ctrl->id, ctrl->value);
return err; return err;
} }
/** /*
* ioctl_enum_fmt_cap - Implement the CAPTURE buffer VIDIOC_ENUM_FMT ioctl * tvp514x_enum_fmt_cap - Implement the CAPTURE buffer VIDIOC_ENUM_FMT ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @fmt: standard V4L2 VIDIOC_ENUM_FMT ioctl structure * @fmt: standard V4L2 VIDIOC_ENUM_FMT ioctl structure
* *
* Implement the VIDIOC_ENUM_FMT ioctl to enumerate supported formats * Implement the VIDIOC_ENUM_FMT ioctl to enumerate supported formats
*/ */
static int static int
ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt) tvp514x_enum_fmt_cap(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmt)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
int index; int index;
if (fmt == NULL) if (fmt == NULL)
...@@ -956,16 +929,15 @@ ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt) ...@@ -956,16 +929,15 @@ ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt)
memcpy(fmt, &decoder->fmt_list[index], memcpy(fmt, &decoder->fmt_list[index],
sizeof(struct v4l2_fmtdesc)); sizeof(struct v4l2_fmtdesc));
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Current FMT: index - %d (%s)",
"Current FMT: index - %d (%s)",
decoder->fmt_list[index].index, decoder->fmt_list[index].index,
decoder->fmt_list[index].description); decoder->fmt_list[index].description);
return 0; return 0;
} }
/** /*
* ioctl_try_fmt_cap - Implement the CAPTURE buffer VIDIOC_TRY_FMT ioctl * tvp514x_try_fmt_cap - Implement the CAPTURE buffer VIDIOC_TRY_FMT ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure * @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure
* *
* Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type. This * Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type. This
...@@ -973,9 +945,9 @@ ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt) ...@@ -973,9 +945,9 @@ ioctl_enum_fmt_cap(struct v4l2_int_device *s, struct v4l2_fmtdesc *fmt)
* without actually making it take effect. * without actually making it take effect.
*/ */
static int static int
ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) tvp514x_try_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
int ifmt; int ifmt;
struct v4l2_pix_format *pix; struct v4l2_pix_format *pix;
enum tvp514x_std current_std; enum tvp514x_std current_std;
...@@ -989,7 +961,7 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) ...@@ -989,7 +961,7 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
pix = &f->fmt.pix; pix = &f->fmt.pix;
/* Calculate height and width based on current standard */ /* Calculate height and width based on current standard */
current_std = tvp514x_get_current_std(decoder); current_std = tvp514x_get_current_std(sd);
if (current_std == STD_INVALID) if (current_std == STD_INVALID)
return -EINVAL; return -EINVAL;
...@@ -1012,17 +984,16 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) ...@@ -1012,17 +984,16 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
pix->colorspace = V4L2_COLORSPACE_SMPTE170M; pix->colorspace = V4L2_COLORSPACE_SMPTE170M;
pix->priv = 0; pix->priv = 0;
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Try FMT: pixelformat - %s, bytesperline - %d"
"Try FMT: pixelformat - %s, bytesperline - %d"
"Width - %d, Height - %d", "Width - %d, Height - %d",
decoder->fmt_list[ifmt].description, pix->bytesperline, decoder->fmt_list[ifmt].description, pix->bytesperline,
pix->width, pix->height); pix->width, pix->height);
return 0; return 0;
} }
/** /*
* ioctl_s_fmt_cap - V4L2 decoder interface handler for VIDIOC_S_FMT ioctl * tvp514x_s_fmt_cap - V4L2 decoder interface handler for VIDIOC_S_FMT ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @f: pointer to standard V4L2 VIDIOC_S_FMT ioctl structure * @f: pointer to standard V4L2 VIDIOC_S_FMT ioctl structure
* *
* If the requested format is supported, configures the HW to use that * If the requested format is supported, configures the HW to use that
...@@ -1030,9 +1001,9 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) ...@@ -1030,9 +1001,9 @@ ioctl_try_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
* correctly configured. * correctly configured.
*/ */
static int static int
ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) tvp514x_s_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
struct v4l2_pix_format *pix; struct v4l2_pix_format *pix;
int rval; int rval;
...@@ -1043,7 +1014,7 @@ ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) ...@@ -1043,7 +1014,7 @@ ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
return -EINVAL; /* only capture is supported */ return -EINVAL; /* only capture is supported */
pix = &f->fmt.pix; pix = &f->fmt.pix;
rval = ioctl_try_fmt_cap(s, f); rval = tvp514x_try_fmt_cap(sd, f);
if (rval) if (rval)
return rval; return rval;
...@@ -1052,18 +1023,18 @@ ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) ...@@ -1052,18 +1023,18 @@ ioctl_s_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
return rval; return rval;
} }
/** /*
* ioctl_g_fmt_cap - V4L2 decoder interface handler for ioctl_g_fmt_cap * tvp514x_g_fmt_cap - V4L2 decoder interface handler for tvp514x_g_fmt_cap
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @f: pointer to standard V4L2 v4l2_format structure * @f: pointer to standard V4L2 v4l2_format structure
* *
* Returns the decoder's current pixel format in the v4l2_format * Returns the decoder's current pixel format in the v4l2_format
* parameter. * parameter.
*/ */
static int static int
ioctl_g_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) tvp514x_g_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
if (f == NULL) if (f == NULL)
return -EINVAL; return -EINVAL;
...@@ -1073,25 +1044,24 @@ ioctl_g_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f) ...@@ -1073,25 +1044,24 @@ ioctl_g_fmt_cap(struct v4l2_int_device *s, struct v4l2_format *f)
f->fmt.pix = decoder->pix; f->fmt.pix = decoder->pix;
v4l_dbg(1, debug, decoder->client, v4l2_dbg(1, debug, sd, "Current FMT: bytesperline - %d"
"Current FMT: bytesperline - %d"
"Width - %d, Height - %d", "Width - %d, Height - %d",
decoder->pix.bytesperline, decoder->pix.bytesperline,
decoder->pix.width, decoder->pix.height); decoder->pix.width, decoder->pix.height);
return 0; return 0;
} }
/** /*
* ioctl_g_parm - V4L2 decoder interface handler for VIDIOC_G_PARM ioctl * tvp514x_g_parm - V4L2 decoder interface handler for VIDIOC_G_PARM ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure * @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure
* *
* Returns the decoder's video CAPTURE parameters. * Returns the decoder's video CAPTURE parameters.
*/ */
static int static int
ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) tvp514x_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *a)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
struct v4l2_captureparm *cparm; struct v4l2_captureparm *cparm;
enum tvp514x_std current_std; enum tvp514x_std current_std;
...@@ -1105,7 +1075,7 @@ ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) ...@@ -1105,7 +1075,7 @@ ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
/* get the current standard */ /* get the current standard */
current_std = tvp514x_get_current_std(decoder); current_std = tvp514x_get_current_std(sd);
if (current_std == STD_INVALID) if (current_std == STD_INVALID)
return -EINVAL; return -EINVAL;
...@@ -1119,18 +1089,18 @@ ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) ...@@ -1119,18 +1089,18 @@ ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
return 0; return 0;
} }
/** /*
* ioctl_s_parm - V4L2 decoder interface handler for VIDIOC_S_PARM ioctl * tvp514x_s_parm - V4L2 decoder interface handler for VIDIOC_S_PARM ioctl
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure * @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure
* *
* Configures the decoder to use the input parameters, if possible. If * Configures the decoder to use the input parameters, if possible. If
* not possible, returns the appropriate error code. * not possible, returns the appropriate error code.
*/ */
static int static int
ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) tvp514x_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *a)
{ {
struct tvp514x_decoder *decoder = s->priv; struct tvp514x_decoder *decoder = to_decoder(sd);
struct v4l2_fract *timeperframe; struct v4l2_fract *timeperframe;
enum tvp514x_std current_std; enum tvp514x_std current_std;
...@@ -1143,7 +1113,7 @@ ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) ...@@ -1143,7 +1113,7 @@ ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
timeperframe = &a->parm.capture.timeperframe; timeperframe = &a->parm.capture.timeperframe;
/* get the current standard */ /* get the current standard */
current_std = tvp514x_get_current_std(decoder); current_std = tvp514x_get_current_std(sd);
if (current_std == STD_INVALID) if (current_std == STD_INVALID)
return -EINVAL; return -EINVAL;
...@@ -1155,112 +1125,59 @@ ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a) ...@@ -1155,112 +1125,59 @@ ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
return 0; return 0;
} }
/** /*
* ioctl_g_ifparm - V4L2 decoder interface handler for vidioc_int_g_ifparm_num * tvp514x_s_stream - V4L2 decoder interface handler for vidioc_int_s_power_num
* @s: pointer to standard V4L2 device structure * @sd: pointer to standard V4L2 sub-device structure
* @p: pointer to standard V4L2 vidioc_int_g_ifparm_num ioctl structure * @enable: streaming enable or disable
*
* Gets slave interface parameters.
* Calculates the required xclk value to support the requested
* clock parameters in p. This value is returned in the p
* parameter.
*/
static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p)
{
struct tvp514x_decoder *decoder = s->priv;
int rval;
if (p == NULL)
return -EINVAL;
if (NULL == decoder->pdata->ifparm)
return -EINVAL;
rval = decoder->pdata->ifparm(p);
if (rval) {
v4l_err(decoder->client, "g_ifparm.Err[%d]\n", rval);
return rval;
}
p->u.bt656.clock_curr = TVP514X_XCLK_BT656;
return 0;
}
/**
* ioctl_g_priv - V4L2 decoder interface handler for vidioc_int_g_priv_num
* @s: pointer to standard V4L2 device structure
* @p: void pointer to hold decoder's private data address
*
* Returns device's (decoder's) private data area address in p parameter
*/
static int ioctl_g_priv(struct v4l2_int_device *s, void *p)
{
struct tvp514x_decoder *decoder = s->priv;
if (NULL == decoder->pdata->priv_data_set)
return -EINVAL;
return decoder->pdata->priv_data_set(p);
}
/**
* ioctl_s_power - V4L2 decoder interface handler for vidioc_int_s_power_num
* @s: pointer to standard V4L2 device structure
* @on: power state to which device is to be set
* *
* Sets devices power state to requrested state, if possible. * Sets streaming to enable or disable, if possible.
*/ */
static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on) static int tvp514x_s_stream(struct v4l2_subdev *sd, int enable)
{ {
struct tvp514x_decoder *decoder = s->priv;
int err = 0; int err = 0;
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct tvp514x_decoder *decoder = to_decoder(sd);
switch (on) { if (decoder->streaming == enable)
case V4L2_POWER_OFF: return 0;
/* Power Down Sequence */
err =
tvp514x_write_reg(decoder->client, REG_OPERATION_MODE,
0x01);
/* Disable mux for TVP5146/47 decoder data path */
if (decoder->pdata->power_set)
err |= decoder->pdata->power_set(on);
decoder->state = STATE_NOT_DETECTED;
break;
case V4L2_POWER_STANDBY: switch (enable) {
if (decoder->pdata->power_set) case 0:
err = decoder->pdata->power_set(on); {
/* Power Down Sequence */
err = tvp514x_write_reg(sd, REG_OPERATION_MODE, 0x01);
if (err) {
v4l2_err(sd, "Unable to turn off decoder\n");
return err;
}
decoder->streaming = enable;
break; break;
}
case 1:
{
struct tvp514x_reg *int_seq = (struct tvp514x_reg *)
client->driver->id_table->driver_data;
case V4L2_POWER_ON: /* Power Up Sequence */
/* Enable mux for TVP5146/47 decoder data path */ err = tvp514x_write_regs(sd, int_seq);
if ((decoder->pdata->power_set) && if (err) {
(decoder->state == STATE_NOT_DETECTED)) { v4l2_err(sd, "Unable to turn on decoder\n");
int i; return err;
struct tvp514x_init_seq *int_seq = }
(struct tvp514x_init_seq *) /* Detect if not already detected */
decoder->id->driver_data; err = tvp514x_detect(sd, decoder);
if (err) {
err = decoder->pdata->power_set(on); v4l2_err(sd, "Unable to detect decoder\n");
return err;
/* Power Up Sequence */
for (i = 0; i < int_seq->no_regs; i++) {
err |= tvp514x_write_reg(decoder->client,
int_seq->init_reg_seq[i].reg,
int_seq->init_reg_seq[i].val);
}
/* Detect the sensor is not already detected */
err |= tvp514x_detect(decoder);
if (err) {
v4l_err(decoder->client,
"Unable to detect decoder\n");
return err;
}
} }
err |= tvp514x_configure(decoder); err = tvp514x_configure(sd, decoder);
if (err) {
v4l2_err(sd, "Unable to configure decoder\n");
return err;
}
decoder->streaming = enable;
break; break;
}
default: default:
err = -ENODEV; err = -ENODEV;
break; break;
...@@ -1269,93 +1186,37 @@ static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on) ...@@ -1269,93 +1186,37 @@ static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on)
return err; return err;
} }
/** static const struct v4l2_subdev_core_ops tvp514x_core_ops = {
* ioctl_init - V4L2 decoder interface handler for VIDIOC_INT_INIT .queryctrl = tvp514x_queryctrl,
* @s: pointer to standard V4L2 device structure .g_ctrl = tvp514x_g_ctrl,
* .s_ctrl = tvp514x_s_ctrl,
* Initialize the decoder device (calls tvp514x_configure()) .s_std = tvp514x_s_std,
*/ };
static int ioctl_init(struct v4l2_int_device *s)
{
struct tvp514x_decoder *decoder = s->priv;
/* Set default standard to auto */
decoder->tvp514x_regs[REG_VIDEO_STD].val =
VIDEO_STD_AUTO_SWITCH_BIT;
return tvp514x_configure(decoder);
}
/**
* ioctl_dev_exit - V4L2 decoder interface handler for vidioc_int_dev_exit_num
* @s: pointer to standard V4L2 device structure
*
* Delinitialise the dev. at slave detach. The complement of ioctl_dev_init.
*/
static int ioctl_dev_exit(struct v4l2_int_device *s)
{
return 0;
}
/**
* ioctl_dev_init - V4L2 decoder interface handler for vidioc_int_dev_init_num
* @s: pointer to standard V4L2 device structure
*
* Initialise the device when slave attaches to the master. Returns 0 if
* TVP5146/47 device could be found, otherwise returns appropriate error.
*/
static int ioctl_dev_init(struct v4l2_int_device *s)
{
struct tvp514x_decoder *decoder = s->priv;
int err;
err = tvp514x_detect(decoder);
if (err < 0) {
v4l_err(decoder->client,
"Unable to detect decoder\n");
return err;
}
v4l_info(decoder->client,
"chip version 0x%.2x detected\n", decoder->ver);
return 0; static const struct v4l2_subdev_video_ops tvp514x_video_ops = {
} .s_routing = tvp514x_s_routing,
.querystd = tvp514x_querystd,
.enum_fmt = tvp514x_enum_fmt_cap,
.g_fmt = tvp514x_g_fmt_cap,
.try_fmt = tvp514x_try_fmt_cap,
.s_fmt = tvp514x_s_fmt_cap,
.g_parm = tvp514x_g_parm,
.s_parm = tvp514x_s_parm,
.s_stream = tvp514x_s_stream,
};
static struct v4l2_int_ioctl_desc tvp514x_ioctl_desc[] = { static const struct v4l2_subdev_ops tvp514x_ops = {
{vidioc_int_dev_init_num, (v4l2_int_ioctl_func*) ioctl_dev_init}, .core = &tvp514x_core_ops,
{vidioc_int_dev_exit_num, (v4l2_int_ioctl_func*) ioctl_dev_exit}, .video = &tvp514x_video_ops,
{vidioc_int_s_power_num, (v4l2_int_ioctl_func*) ioctl_s_power},
{vidioc_int_g_priv_num, (v4l2_int_ioctl_func*) ioctl_g_priv},
{vidioc_int_g_ifparm_num, (v4l2_int_ioctl_func*) ioctl_g_ifparm},
{vidioc_int_init_num, (v4l2_int_ioctl_func*) ioctl_init},
{vidioc_int_enum_fmt_cap_num,
(v4l2_int_ioctl_func *) ioctl_enum_fmt_cap},
{vidioc_int_try_fmt_cap_num,
(v4l2_int_ioctl_func *) ioctl_try_fmt_cap},
{vidioc_int_g_fmt_cap_num,
(v4l2_int_ioctl_func *) ioctl_g_fmt_cap},
{vidioc_int_s_fmt_cap_num,
(v4l2_int_ioctl_func *) ioctl_s_fmt_cap},
{vidioc_int_g_parm_num, (v4l2_int_ioctl_func *) ioctl_g_parm},
{vidioc_int_s_parm_num, (v4l2_int_ioctl_func *) ioctl_s_parm},
{vidioc_int_queryctrl_num,
(v4l2_int_ioctl_func *) ioctl_queryctrl},
{vidioc_int_g_ctrl_num, (v4l2_int_ioctl_func *) ioctl_g_ctrl},
{vidioc_int_s_ctrl_num, (v4l2_int_ioctl_func *) ioctl_s_ctrl},
{vidioc_int_querystd_num, (v4l2_int_ioctl_func *) ioctl_querystd},
{vidioc_int_s_std_num, (v4l2_int_ioctl_func *) ioctl_s_std},
{vidioc_int_s_video_routing_num,
(v4l2_int_ioctl_func *) ioctl_s_routing},
}; };
static struct tvp514x_decoder tvp514x_dev = { static struct tvp514x_decoder tvp514x_dev = {
.state = STATE_NOT_DETECTED, .streaming = 0,
.fmt_list = tvp514x_fmt_list, .fmt_list = tvp514x_fmt_list,
.num_fmts = ARRAY_SIZE(tvp514x_fmt_list), .num_fmts = ARRAY_SIZE(tvp514x_fmt_list),
.pix = { /* Default to NTSC 8-bit YUV 422 */ .pix = {/* Default to NTSC 8-bit YUV 422 */
.width = NTSC_NUM_ACTIVE_PIXELS, .width = NTSC_NUM_ACTIVE_PIXELS,
.height = NTSC_NUM_ACTIVE_LINES, .height = NTSC_NUM_ACTIVE_LINES,
.pixelformat = V4L2_PIX_FMT_UYVY, .pixelformat = V4L2_PIX_FMT_UYVY,
...@@ -1369,20 +1230,13 @@ static struct tvp514x_decoder tvp514x_dev = { ...@@ -1369,20 +1230,13 @@ static struct tvp514x_decoder tvp514x_dev = {
.current_std = STD_NTSC_MJ, .current_std = STD_NTSC_MJ,
.std_list = tvp514x_std_list, .std_list = tvp514x_std_list,
.num_stds = ARRAY_SIZE(tvp514x_std_list), .num_stds = ARRAY_SIZE(tvp514x_std_list),
.v4l2_int_device = {
.module = THIS_MODULE,
.name = TVP514X_MODULE_NAME,
.type = v4l2_int_type_slave,
},
.tvp514x_slave = {
.ioctls = tvp514x_ioctl_desc,
.num_ioctls = ARRAY_SIZE(tvp514x_ioctl_desc),
},
}; };
/** /*
* tvp514x_probe - decoder driver i2c probe handler * tvp514x_probe - decoder driver i2c probe handler
* @client: i2c driver client device structure * @client: i2c driver client device structure
* @id: i2c driver id table
* *
* Register decoder as an i2c client device and V4L2 * Register decoder as an i2c client device and V4L2
* device. * device.
...@@ -1391,82 +1245,71 @@ static int ...@@ -1391,82 +1245,71 @@ static int
tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
{ {
struct tvp514x_decoder *decoder; struct tvp514x_decoder *decoder;
int err; struct v4l2_subdev *sd;
/* Check if the adapter supports the needed features */ /* Check if the adapter supports the needed features */
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -EIO; return -EIO;
if (!client->dev.platform_data) {
v4l2_err(client, "No platform data!!\n");
return -ENODEV;
}
decoder = kzalloc(sizeof(*decoder), GFP_KERNEL); decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
if (!decoder) if (!decoder)
return -ENOMEM; return -ENOMEM;
if (!client->dev.platform_data) { /*
v4l_err(client, "No platform data!!\n"); * Initialize the tvp514x_decoder with default configuration
err = -ENODEV; */
goto out_free;
}
*decoder = tvp514x_dev; *decoder = tvp514x_dev;
decoder->v4l2_int_device.priv = decoder; /* Copy default register configuration */
decoder->pdata = client->dev.platform_data;
decoder->v4l2_int_device.u.slave = &decoder->tvp514x_slave;
memcpy(decoder->tvp514x_regs, tvp514x_reg_list_default, memcpy(decoder->tvp514x_regs, tvp514x_reg_list_default,
sizeof(tvp514x_reg_list_default)); sizeof(tvp514x_reg_list_default));
/*
* Copy board specific information here
*/
decoder->pdata = client->dev.platform_data;
/* /*
* Fetch platform specific data, and configure the * Fetch platform specific data, and configure the
* tvp514x_reg_list[] accordingly. Since this is one * tvp514x_reg_list[] accordingly. Since this is one
* time configuration, no need to preserve. * time configuration, no need to preserve.
*/ */
decoder->tvp514x_regs[REG_OUTPUT_FORMATTER2].val |= decoder->tvp514x_regs[REG_OUTPUT_FORMATTER2].val |=
(decoder->pdata->clk_polarity << 1); (decoder->pdata->clk_polarity << 1);
decoder->tvp514x_regs[REG_SYNC_CONTROL].val |= decoder->tvp514x_regs[REG_SYNC_CONTROL].val |=
((decoder->pdata->hs_polarity << 2) | ((decoder->pdata->hs_polarity << 2) |
(decoder->pdata->vs_polarity << 3)); (decoder->pdata->vs_polarity << 3));
/* /* Set default standard to auto */
* Save the id data, required for power up sequence decoder->tvp514x_regs[REG_VIDEO_STD].val =
*/ VIDEO_STD_AUTO_SWITCH_BIT;
decoder->id = (struct i2c_device_id *)id;
/* Attach to Master */
strcpy(decoder->v4l2_int_device.u.slave->attach_to,
decoder->pdata->master);
decoder->client = client;
i2c_set_clientdata(client, decoder);
/* Register with V4L2 layer as slave device */ /* Register with V4L2 layer as slave device */
err = v4l2_int_device_register(&decoder->v4l2_int_device); sd = &decoder->sd;
if (err) { v4l2_i2c_subdev_init(sd, client, &tvp514x_ops);
i2c_set_clientdata(client, NULL);
v4l_err(client, v4l2_info(sd, "%s decoder driver registered !!\n", sd->name);
"Unable to register to v4l2. Err[%d]\n", err);
goto out_free;
} else
v4l_info(client, "Registered to v4l2 master %s!!\n",
decoder->pdata->master);
return 0; return 0;
out_free:
kfree(decoder);
return err;
} }
/** /*
* tvp514x_remove - decoder driver i2c remove handler * tvp514x_remove - decoder driver i2c remove handler
* @client: i2c driver client device structure * @client: i2c driver client device structure
* *
* Unregister decoder as an i2c client device and V4L2 * Unregister decoder as an i2c client device and V4L2
* device. Complement of tvp514x_probe(). * device. Complement of tvp514x_probe().
*/ */
static int __exit tvp514x_remove(struct i2c_client *client) static int tvp514x_remove(struct i2c_client *client)
{ {
struct tvp514x_decoder *decoder = i2c_get_clientdata(client); struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct tvp514x_decoder *decoder = to_decoder(sd);
if (!client->adapter)
return -ENODEV; /* our client isn't attached */
v4l2_int_device_unregister(&decoder->v4l2_int_device); v4l2_device_unregister_subdev(sd);
i2c_set_clientdata(client, NULL);
kfree(decoder); kfree(decoder);
return 0; return 0;
} }
...@@ -1485,11 +1328,9 @@ static const struct tvp514x_reg tvp5146_init_reg_seq[] = { ...@@ -1485,11 +1328,9 @@ static const struct tvp514x_reg tvp5146_init_reg_seq[] = {
{TOK_WRITE, REG_VBUS_DATA_ACCESS_NO_VBUS_ADDR_INCR, 0x00}, {TOK_WRITE, REG_VBUS_DATA_ACCESS_NO_VBUS_ADDR_INCR, 0x00},
{TOK_WRITE, REG_OPERATION_MODE, 0x01}, {TOK_WRITE, REG_OPERATION_MODE, 0x01},
{TOK_WRITE, REG_OPERATION_MODE, 0x00}, {TOK_WRITE, REG_OPERATION_MODE, 0x00},
{TOK_TERM, 0, 0},
}; };
static const struct tvp514x_init_seq tvp5146_init = {
.no_regs = ARRAY_SIZE(tvp5146_init_reg_seq),
.init_reg_seq = tvp5146_init_reg_seq,
};
/* /*
* TVP5147 Init/Power on Sequence * TVP5147 Init/Power on Sequence
*/ */
...@@ -1512,22 +1353,18 @@ static const struct tvp514x_reg tvp5147_init_reg_seq[] = { ...@@ -1512,22 +1353,18 @@ static const struct tvp514x_reg tvp5147_init_reg_seq[] = {
{TOK_WRITE, REG_VBUS_DATA_ACCESS_NO_VBUS_ADDR_INCR, 0x00}, {TOK_WRITE, REG_VBUS_DATA_ACCESS_NO_VBUS_ADDR_INCR, 0x00},
{TOK_WRITE, REG_OPERATION_MODE, 0x01}, {TOK_WRITE, REG_OPERATION_MODE, 0x01},
{TOK_WRITE, REG_OPERATION_MODE, 0x00}, {TOK_WRITE, REG_OPERATION_MODE, 0x00},
{TOK_TERM, 0, 0},
}; };
static const struct tvp514x_init_seq tvp5147_init = {
.no_regs = ARRAY_SIZE(tvp5147_init_reg_seq),
.init_reg_seq = tvp5147_init_reg_seq,
};
/* /*
* TVP5146M2/TVP5147M1 Init/Power on Sequence * TVP5146M2/TVP5147M1 Init/Power on Sequence
*/ */
static const struct tvp514x_reg tvp514xm_init_reg_seq[] = { static const struct tvp514x_reg tvp514xm_init_reg_seq[] = {
{TOK_WRITE, REG_OPERATION_MODE, 0x01}, {TOK_WRITE, REG_OPERATION_MODE, 0x01},
{TOK_WRITE, REG_OPERATION_MODE, 0x00}, {TOK_WRITE, REG_OPERATION_MODE, 0x00},
{TOK_TERM, 0, 0},
}; };
static const struct tvp514x_init_seq tvp514xm_init = {
.no_regs = ARRAY_SIZE(tvp514xm_init_reg_seq),
.init_reg_seq = tvp514xm_init_reg_seq,
};
/* /*
* I2C Device Table - * I2C Device Table -
* *
...@@ -1535,48 +1372,34 @@ static const struct tvp514x_init_seq tvp514xm_init = { ...@@ -1535,48 +1372,34 @@ static const struct tvp514x_init_seq tvp514xm_init = {
* driver_data - Driver data * driver_data - Driver data
*/ */
static const struct i2c_device_id tvp514x_id[] = { static const struct i2c_device_id tvp514x_id[] = {
{"tvp5146", (unsigned long)&tvp5146_init}, {"tvp5146", (unsigned long)tvp5146_init_reg_seq},
{"tvp5146m2", (unsigned long)&tvp514xm_init}, {"tvp5146m2", (unsigned long)tvp514xm_init_reg_seq},
{"tvp5147", (unsigned long)&tvp5147_init}, {"tvp5147", (unsigned long)tvp5147_init_reg_seq},
{"tvp5147m1", (unsigned long)&tvp514xm_init}, {"tvp5147m1", (unsigned long)tvp514xm_init_reg_seq},
{}, {},
}; };
MODULE_DEVICE_TABLE(i2c, tvp514x_id); MODULE_DEVICE_TABLE(i2c, tvp514x_id);
static struct i2c_driver tvp514x_i2c_driver = { static struct i2c_driver tvp514x_driver = {
.driver = { .driver = {
.name = TVP514X_MODULE_NAME, .owner = THIS_MODULE,
.owner = THIS_MODULE, .name = TVP514X_MODULE_NAME,
}, },
.probe = tvp514x_probe, .probe = tvp514x_probe,
.remove = __exit_p(tvp514x_remove), .remove = tvp514x_remove,
.id_table = tvp514x_id, .id_table = tvp514x_id,
}; };
/**
* tvp514x_init
*
* Module init function
*/
static int __init tvp514x_init(void) static int __init tvp514x_init(void)
{ {
return i2c_add_driver(&tvp514x_i2c_driver); return i2c_add_driver(&tvp514x_driver);
} }
/** static void __exit tvp514x_exit(void)
* tvp514x_cleanup
*
* Module exit function
*/
static void __exit tvp514x_cleanup(void)
{ {
i2c_del_driver(&tvp514x_i2c_driver); i2c_del_driver(&tvp514x_driver);
} }
module_init(tvp514x_init); module_init(tvp514x_init);
module_exit(tvp514x_cleanup); module_exit(tvp514x_exit);
MODULE_AUTHOR("Texas Instruments");
MODULE_DESCRIPTION("TVP514X linux decoder driver");
MODULE_LICENSE("GPL");
drivers/media/video/tvp514x_regs.h
View file @ 62ef80a1
...@@ -284,14 +284,4 @@ struct tvp514x_reg { ...@@ -284,14 +284,4 @@ struct tvp514x_reg {
u32 val; u32 val;
}; };
/**
* struct tvp514x_init_seq - Structure for TVP5146/47/46M2/47M1 power up
* Sequence.
* @ no_regs - Number of registers to write for power up sequence.
* @ init_reg_seq - Array of registers and respective value to write.
*/
struct tvp514x_init_seq {
unsigned int no_regs;
const struct tvp514x_reg *init_reg_seq;
};
#endif /* ifndef _TVP514X_REGS_H */ #endif /* ifndef _TVP514X_REGS_H */
include/media/tvp514x.h
View file @ 62ef80a1
...@@ -104,10 +104,6 @@ enum tvp514x_output { ...@@ -104,10 +104,6 @@ enum tvp514x_output {
* @ vs_polarity: VSYNC Polarity configuration for current interface. * @ vs_polarity: VSYNC Polarity configuration for current interface.
*/ */
struct tvp514x_platform_data { struct tvp514x_platform_data {
char *master;
int (*power_set) (enum v4l2_power on);
int (*ifparm) (struct v4l2_ifparm *p);
int (*priv_data_set) (void *);
/* Interface control params */ /* Interface control params */
bool clk_polarity; bool clk_polarity;
bool hs_polarity; bool hs_polarity;
......
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