V4L/DVB (10953): cx25840: Fix CodingStyle errors introduced by the last patch
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
149783b581
commit
95b14fb23b
|
@ -45,12 +45,11 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state->is_cx231xx) {
|
if (!state->is_cx231xx) {
|
||||||
|
/* VID_PLL and AUX_PLL */
|
||||||
|
cx25840_write4(client, 0x108, 0x1006040f);
|
||||||
|
|
||||||
/* VID_PLL and AUX_PLL */
|
/* AUX_PLL_FRAC */
|
||||||
cx25840_write4(client, 0x108, 0x1006040f);
|
cx25840_write4(client, 0x110, 0x01bb39ee);
|
||||||
|
|
||||||
/* AUX_PLL_FRAC */
|
|
||||||
cx25840_write4(client, 0x110, 0x01bb39ee);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->is_cx25836)
|
if (state->is_cx25836)
|
||||||
|
@ -70,7 +69,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state->is_cx231xx) {
|
if (!state->is_cx231xx) {
|
||||||
|
|
||||||
/* VID_PLL and AUX_PLL */
|
/* VID_PLL and AUX_PLL */
|
||||||
cx25840_write4(client, 0x108, 0x1009040f);
|
cx25840_write4(client, 0x108, 0x1009040f);
|
||||||
|
|
||||||
|
@ -95,12 +93,11 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state->is_cx231xx) {
|
if (!state->is_cx231xx) {
|
||||||
|
/* VID_PLL and AUX_PLL */
|
||||||
|
cx25840_write4(client, 0x108, 0x100a040f);
|
||||||
|
|
||||||
/* VID_PLL and AUX_PLL */
|
/* AUX_PLL_FRAC */
|
||||||
cx25840_write4(client, 0x108, 0x100a040f);
|
cx25840_write4(client, 0x110, 0x0098d6e5);
|
||||||
|
|
||||||
/* AUX_PLL_FRAC */
|
|
||||||
cx25840_write4(client, 0x110, 0x0098d6e5);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->is_cx25836)
|
if (state->is_cx25836)
|
||||||
|
@ -122,12 +119,11 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state->is_cx231xx) {
|
if (!state->is_cx231xx) {
|
||||||
|
/* VID_PLL and AUX_PLL */
|
||||||
|
cx25840_write4(client, 0x108, 0x1e08040f);
|
||||||
|
|
||||||
/* VID_PLL and AUX_PLL */
|
/* AUX_PLL_FRAC */
|
||||||
cx25840_write4(client, 0x108, 0x1e08040f);
|
cx25840_write4(client, 0x110, 0x012a0869);
|
||||||
|
|
||||||
/* AUX_PLL_FRAC */
|
|
||||||
cx25840_write4(client, 0x110, 0x012a0869);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->is_cx25836)
|
if (state->is_cx25836)
|
||||||
|
@ -154,12 +150,11 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
|
||||||
|
|
||||||
|
|
||||||
if (!state->is_cx231xx) {
|
if (!state->is_cx231xx) {
|
||||||
|
/* VID_PLL and AUX_PLL */
|
||||||
|
cx25840_write4(client, 0x108, 0x1809040f);
|
||||||
|
|
||||||
/* VID_PLL and AUX_PLL */
|
/* AUX_PLL_FRAC */
|
||||||
cx25840_write4(client, 0x108, 0x1809040f);
|
cx25840_write4(client, 0x110, 0x00ec6bd6);
|
||||||
|
|
||||||
/* AUX_PLL_FRAC */
|
|
||||||
cx25840_write4(client, 0x110, 0x00ec6bd6);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->is_cx25836)
|
if (state->is_cx25836)
|
||||||
|
@ -247,10 +242,9 @@ void cx25840_audio_set_path(struct i2c_client *client)
|
||||||
/* deassert soft reset */
|
/* deassert soft reset */
|
||||||
cx25840_and_or(client, 0x810, ~0x1, 0x00);
|
cx25840_and_or(client, 0x810, ~0x1, 0x00);
|
||||||
|
|
||||||
if (state->is_cx23885 || state->is_cx231xx) {
|
/* Ensure the controller is running when we exit */
|
||||||
/* Ensure the controller is running when we exit */
|
if (state->is_cx23885 || state->is_cx231xx)
|
||||||
cx25840_and_or(client, 0x803, ~0x10, 0x10);
|
cx25840_and_or(client, 0x803, ~0x10, 0x10);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_volume(struct i2c_client *client)
|
static int get_volume(struct i2c_client *client)
|
||||||
|
|
|
@ -374,15 +374,12 @@ static void cx231xx_initialize(struct i2c_client *client)
|
||||||
/* DIF Src phase inc */
|
/* DIF Src phase inc */
|
||||||
cx25840_write4(client, 0x340, 0x0df7df83);
|
cx25840_write4(client, 0x340, 0x0df7df83);
|
||||||
|
|
||||||
|
|
||||||
/* Luma */
|
/* Luma */
|
||||||
cx25840_write4(client, 0x414, 0x00107d12);
|
cx25840_write4(client, 0x414, 0x00107d12);
|
||||||
|
|
||||||
/* Chroma */
|
/* Chroma */
|
||||||
cx25840_write4(client, 0x420, 0x3d008282);
|
cx25840_write4(client, 0x420, 0x3d008282);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* ADC2 input select */
|
/* ADC2 input select */
|
||||||
cx25840_write(client, 0x102, 0x10);
|
cx25840_write(client, 0x102, 0x10);
|
||||||
|
|
||||||
|
@ -395,7 +392,6 @@ static void cx231xx_initialize(struct i2c_client *client)
|
||||||
/* White crush, Chroma AGC & Chroma Killer enabled */
|
/* White crush, Chroma AGC & Chroma Killer enabled */
|
||||||
cx25840_write(client, 0x401, 0xe8);
|
cx25840_write(client, 0x401, 0xe8);
|
||||||
|
|
||||||
|
|
||||||
/* Do the firmware load in a work handler to prevent.
|
/* Do the firmware load in a work handler to prevent.
|
||||||
Otherwise the kernel is blocked waiting for the
|
Otherwise the kernel is blocked waiting for the
|
||||||
bit-banging i2c interface to finish uploading the
|
bit-banging i2c interface to finish uploading the
|
||||||
|
@ -489,42 +485,42 @@ void cx25840_std_setup(struct i2c_client *client)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* DEBUG: Displays configured PLL frequency */
|
/* DEBUG: Displays configured PLL frequency */
|
||||||
if (!state->is_cx231xx) {
|
if (!state->is_cx231xx) {
|
||||||
pll_int = cx25840_read(client, 0x108);
|
pll_int = cx25840_read(client, 0x108);
|
||||||
pll_frac = cx25840_read4(client, 0x10c) & 0x1ffffff;
|
pll_frac = cx25840_read4(client, 0x10c) & 0x1ffffff;
|
||||||
pll_post = cx25840_read(client, 0x109);
|
pll_post = cx25840_read(client, 0x109);
|
||||||
v4l_dbg(1, cx25840_debug, client,
|
|
||||||
"PLL regs = int: %u, frac: %u, post: %u\n",
|
|
||||||
pll_int, pll_frac, pll_post);
|
|
||||||
|
|
||||||
if (pll_post) {
|
|
||||||
int fin, fsc;
|
|
||||||
int pll = (28636363L * ((((u64)pll_int) << 25L) + pll_frac)) >> 25L;
|
|
||||||
|
|
||||||
pll /= pll_post;
|
|
||||||
v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",
|
|
||||||
pll / 1000000, pll % 1000000);
|
|
||||||
v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",
|
|
||||||
pll / 8000000, (pll / 8) % 1000000);
|
|
||||||
|
|
||||||
fin = ((u64)src_decimation * pll) >> 12;
|
|
||||||
v4l_dbg(1, cx25840_debug, client,
|
v4l_dbg(1, cx25840_debug, client,
|
||||||
"ADC Sampling freq = %d.%06d MHz\n",
|
"PLL regs = int: %u, frac: %u, post: %u\n",
|
||||||
fin / 1000000, fin % 1000000);
|
pll_int, pll_frac, pll_post);
|
||||||
|
|
||||||
fsc = (((u64)sc) * pll) >> 24L;
|
if (pll_post) {
|
||||||
v4l_dbg(1, cx25840_debug, client,
|
int fin, fsc;
|
||||||
"Chroma sub-carrier freq = %d.%06d MHz\n",
|
int pll = (28636363L * ((((u64)pll_int) << 25L) + pll_frac)) >> 25L;
|
||||||
fsc / 1000000, fsc % 1000000);
|
|
||||||
|
|
||||||
v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
|
pll /= pll_post;
|
||||||
"vblank %i, vactive %i, vblank656 %i, src_dec %i, "
|
v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",
|
||||||
"burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x, "
|
pll / 1000000, pll % 1000000);
|
||||||
"sc 0x%06x\n",
|
v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",
|
||||||
hblank, hactive, vblank, vactive, vblank656,
|
pll / 8000000, (pll / 8) % 1000000);
|
||||||
src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
|
|
||||||
|
fin = ((u64)src_decimation * pll) >> 12;
|
||||||
|
v4l_dbg(1, cx25840_debug, client,
|
||||||
|
"ADC Sampling freq = %d.%06d MHz\n",
|
||||||
|
fin / 1000000, fin % 1000000);
|
||||||
|
|
||||||
|
fsc = (((u64)sc) * pll) >> 24L;
|
||||||
|
v4l_dbg(1, cx25840_debug, client,
|
||||||
|
"Chroma sub-carrier freq = %d.%06d MHz\n",
|
||||||
|
fsc / 1000000, fsc % 1000000);
|
||||||
|
|
||||||
|
v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "
|
||||||
|
"vblank %i, vactive %i, vblank656 %i, src_dec %i, "
|
||||||
|
"burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x, "
|
||||||
|
"sc 0x%06x\n",
|
||||||
|
hblank, hactive, vblank, vactive, vblank656,
|
||||||
|
src_decimation, burst, luma_lpf, uv_lpf, comb, sc);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Sets horizontal blanking delay and active lines */
|
/* Sets horizontal blanking delay and active lines */
|
||||||
cx25840_write(client, 0x470, hblank);
|
cx25840_write(client, 0x470, hblank);
|
||||||
|
@ -809,7 +805,7 @@ static int set_v4lstd(struct i2c_client *client)
|
||||||
|
|
||||||
static int cx25840_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
|
static int cx25840_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
|
||||||
{
|
{
|
||||||
struct cx25840_state *state = to_state(sd);
|
struct cx25840_state *state = to_state(sd);
|
||||||
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
||||||
|
|
||||||
switch (ctrl->id) {
|
switch (ctrl->id) {
|
||||||
|
@ -876,7 +872,7 @@ static int cx25840_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
|
||||||
|
|
||||||
static int cx25840_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
|
static int cx25840_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
|
||||||
{
|
{
|
||||||
struct cx25840_state *state = to_state(sd);
|
struct cx25840_state *state = to_state(sd);
|
||||||
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
||||||
|
|
||||||
switch (ctrl->id) {
|
switch (ctrl->id) {
|
||||||
|
@ -1208,7 +1204,7 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val)
|
||||||
cx25836_initialize(client);
|
cx25836_initialize(client);
|
||||||
else if (state->is_cx23885)
|
else if (state->is_cx23885)
|
||||||
cx23885_initialize(client);
|
cx23885_initialize(client);
|
||||||
else if (state->is_cx231xx)
|
else if (state->is_cx231xx)
|
||||||
cx231xx_initialize(client);
|
cx231xx_initialize(client);
|
||||||
else
|
else
|
||||||
cx25840_initialize(client);
|
cx25840_initialize(client);
|
||||||
|
@ -1567,7 +1563,7 @@ static int cx25840_probe(struct i2c_client *client,
|
||||||
state->c = client;
|
state->c = client;
|
||||||
state->is_cx25836 = ((device_id & 0xff00) == 0x8300);
|
state->is_cx25836 = ((device_id & 0xff00) == 0x8300);
|
||||||
state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313);
|
state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313);
|
||||||
state->is_cx231xx = (device_id == 0x5A3E);
|
state->is_cx231xx = (device_id == 0x5a3e);
|
||||||
state->vid_input = CX25840_COMPOSITE7;
|
state->vid_input = CX25840_COMPOSITE7;
|
||||||
state->aud_input = CX25840_AUDIO8;
|
state->aud_input = CX25840_AUDIO8;
|
||||||
state->audclk_freq = 48000;
|
state->audclk_freq = 48000;
|
||||||
|
|
|
@ -97,17 +97,17 @@ int cx25840_loadfw(struct i2c_client *client)
|
||||||
u8 buffer[FWSEND];
|
u8 buffer[FWSEND];
|
||||||
const u8 *ptr;
|
const u8 *ptr;
|
||||||
int size, retval;
|
int size, retval;
|
||||||
int MAX_BUF_SIZE = FWSEND;
|
int MAX_BUF_SIZE = FWSEND;
|
||||||
|
|
||||||
if (state->is_cx23885)
|
if (state->is_cx23885)
|
||||||
firmware = FWFILE_CX23885;
|
firmware = FWFILE_CX23885;
|
||||||
else if ( state->is_cx231xx)
|
else if (state->is_cx231xx)
|
||||||
firmware = FWFILE_CX231XX;
|
firmware = FWFILE_CX231XX;
|
||||||
|
|
||||||
if( (state->is_cx231xx) && MAX_BUF_SIZE > 16) {
|
if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
|
||||||
printk(" Firmware download size changed to 16 bytes max length\n");
|
v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
|
||||||
MAX_BUF_SIZE = 16; /* cx231xx cannot accept more than 16 bytes at a time */
|
MAX_BUF_SIZE = 16; /* cx231xx cannot accept more than 16 bytes at a time */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
|
if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
|
||||||
v4l_err(client, "unable to open firmware %s\n", firmware);
|
v4l_err(client, "unable to open firmware %s\n", firmware);
|
||||||
|
|
Loading…
Reference in New Issue