openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: i2c: adv7343: make the platform data members as array 

This patch makes the platform data members as array wherever
possible, so as this makes easier while collecting the data
in DT case and read the entire array at once.
This patch also makes appropriate changes to board-da850-evm.c

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Lad, Prabhakar 2013-07-20 02:21:05 -03:00 committed by Mauro Carvalho Chehab
parent 6ef8335928
commit 5e95814ff3
3 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-davinci/board-da850-evm.c
View File

@ -1249,12 +1249,10 @@ static struct vpif_capture_config da850_vpif_capture_config = {
static struct adv7343_platform_data adv7343_pdata = { static struct adv7343_platform_data adv7343_pdata = {
.mode_config = { .mode_config = {
.dac_3 = 1, .dac = { 1, 1, 1 },
.dac_2 = 1,
.dac_1 = 1,
}, },
.sd_config = { .sd_config = {
.sd_dac_out1 = 1, .sd_dac_out = { 1 },
}, },
}; };

28
drivers/media/i2c/adv7343.c
View File

@ -227,12 +227,12 @@ static int adv7343_setoutput(struct v4l2_subdev *sd, u32 output_type)
else else
val = state->pdata->mode_config.sleep_mode << 0 | val = state->pdata->mode_config.sleep_mode << 0 |
state->pdata->mode_config.pll_control << 1 | state->pdata->mode_config.pll_control << 1 |
state->pdata->mode_config.dac_3 << 2 | state->pdata->mode_config.dac[2] << 2 |
state->pdata->mode_config.dac_2 << 3 | state->pdata->mode_config.dac[1] << 3 |
state->pdata->mode_config.dac_1 << 4 | state->pdata->mode_config.dac[0] << 4 |
state->pdata->mode_config.dac_6 << 5 | state->pdata->mode_config.dac[5] << 5 |
state->pdata->mode_config.dac_5 << 6 | state->pdata->mode_config.dac[4] << 6 |
state->pdata->mode_config.dac_4 << 7; state->pdata->mode_config.dac[3] << 7;
err = adv7343_write(sd, ADV7343_POWER_MODE_REG, val); err = adv7343_write(sd, ADV7343_POWER_MODE_REG, val);
if (err < 0) if (err < 0)
@ -251,15 +251,15 @@ static int adv7343_setoutput(struct v4l2_subdev *sd, u32 output_type)
/* configure SD DAC Output 2 and SD DAC Output 1 bit to zero */ /* configure SD DAC Output 2 and SD DAC Output 1 bit to zero */
val = state->reg82 & (SD_DAC_1_DI & SD_DAC_2_DI); val = state->reg82 & (SD_DAC_1_DI & SD_DAC_2_DI);
if (state->pdata && state->pdata->sd_config.sd_dac_out1) if (state->pdata && state->pdata->sd_config.sd_dac_out[0])
val = val | (state->pdata->sd_config.sd_dac_out1 << 1); val = val | (state->pdata->sd_config.sd_dac_out[0] << 1);
else if (state->pdata && !state->pdata->sd_config.sd_dac_out1) else if (state->pdata && !state->pdata->sd_config.sd_dac_out[0])
val = val & ~(state->pdata->sd_config.sd_dac_out1 << 1); val = val & ~(state->pdata->sd_config.sd_dac_out[0] << 1);
if (state->pdata && state->pdata->sd_config.sd_dac_out2) if (state->pdata && state->pdata->sd_config.sd_dac_out[1])
val = val | (state->pdata->sd_config.sd_dac_out2 << 2); val = val | (state->pdata->sd_config.sd_dac_out[1] << 2);
else if (state->pdata && !state->pdata->sd_config.sd_dac_out2) else if (state->pdata && !state->pdata->sd_config.sd_dac_out[1])
val = val & ~(state->pdata->sd_config.sd_dac_out2 << 2); val = val & ~(state->pdata->sd_config.sd_dac_out[1] << 2);
err = adv7343_write(sd, ADV7343_SD_MODE_REG2, val); err = adv7343_write(sd, ADV7343_SD_MODE_REG2, val);
if (err < 0) if (err < 0)

20
include/media/adv7343.h
View File

@ -28,12 +28,7 @@
* @pll_control: PLL and oversampling control. This control allows internal * @pll_control: PLL and oversampling control. This control allows internal
* PLL 1 circuit to be powered down and the oversampling to be * PLL 1 circuit to be powered down and the oversampling to be
* switched off. * switched off.
* @dac_1: power on/off DAC 1. * @dac: array to configure power on/off DAC's 1..6
* @dac_2: power on/off DAC 2.
* @dac_3: power on/off DAC 3.
* @dac_4: power on/off DAC 4.
* @dac_5: power on/off DAC 5.
* @dac_6: power on/off DAC 6.
* *
* Power mode register (Register 0x0), for more info refer REGISTER MAP ACCESS * Power mode register (Register 0x0), for more info refer REGISTER MAP ACCESS
* section of datasheet[1], table 17 page no 30. * section of datasheet[1], table 17 page no 30.
@ -43,23 +38,16 @@
struct adv7343_power_mode { struct adv7343_power_mode {
bool sleep_mode; bool sleep_mode;
bool pll_control; bool pll_control;
bool dac_1; u32 dac[6];
bool dac_2;
bool dac_3;
bool dac_4;
bool dac_5;
bool dac_6;
}; };
/** /**
* struct adv7343_sd_config - SD Only Output Configuration. * struct adv7343_sd_config - SD Only Output Configuration.
* @sd_dac_out1: Configure SD DAC Output 1. * @sd_dac_out: array configuring SD DAC Outputs 1 and 2
* @sd_dac_out2: Configure SD DAC Output 2.
*/ */
struct adv7343_sd_config { struct adv7343_sd_config {
/* SD only Output Configuration */ /* SD only Output Configuration */
bool sd_dac_out1; u32 sd_dac_out[2];
bool sd_dac_out2;
}; };
/** /**