diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-31 20:25:39 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 00:31:59 +0100 |
| commit | 38f5ddc1bf12887c0abe287de359e853e12fcc19 (patch) | |
| tree | 314e80c1da8afe070e28eb3427f89947b0397d05 /drivers/media/video/cx231xx | |
| parent | [media] cx231xx: Use parameters to describe some board variants (diff) | |
| download | linux-38f5ddc1bf12887c0abe287de359e853e12fcc19.tar.xz linux-38f5ddc1bf12887c0abe287de359e853e12fcc19.zip | |
[media] cx231xx: Allow some boards to not use I2C port 3
Some devices don't need to use it. So allow to just disable this logic.
Having it enabled on some devices cause power management to complain,
generating error -71.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-avcore.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index b80bccfa9b2d..62843d39817c 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -1271,6 +1271,8 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3) int status = 0; bool current_is_port_3; + if (dev->board.dont_use_port_3) + is_port_3 = false; status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN, value, 4); if (status < 0) diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index b72503d625b5..e1c222b05204 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h @@ -357,6 +357,7 @@ struct cx231xx_board { unsigned int valid:1; unsigned int no_alt_vanc:1; unsigned int external_av:1; + unsigned int dont_use_port_3:1; unsigned char xclk, i2c_speed; |