diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-31 14:25:39 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:31:59 -0400 |
commit | 38f5ddc1bf12887c0abe287de359e853e12fcc19 (patch) | |
tree | 314e80c1da8afe070e28eb3427f89947b0397d05 /drivers/media/video/cx231xx | |
parent | 2f86138706d3b5c85a69e72ca2959717372386dd (diff) |
[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 b80bccfa9b2..62843d39817 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) | |||
1271 | int status = 0; | 1271 | int status = 0; |
1272 | bool current_is_port_3; | 1272 | bool current_is_port_3; |
1273 | 1273 | ||
1274 | if (dev->board.dont_use_port_3) | ||
1275 | is_port_3 = false; | ||
1274 | status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, | 1276 | status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, |
1275 | PWR_CTL_EN, value, 4); | 1277 | PWR_CTL_EN, value, 4); |
1276 | if (status < 0) | 1278 | if (status < 0) |
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index b72503d625b..e1c222b0520 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
@@ -357,6 +357,7 @@ struct cx231xx_board { | |||
357 | unsigned int valid:1; | 357 | unsigned int valid:1; |
358 | unsigned int no_alt_vanc:1; | 358 | unsigned int no_alt_vanc:1; |
359 | unsigned int external_av:1; | 359 | unsigned int external_av:1; |
360 | unsigned int dont_use_port_3:1; | ||
360 | 361 | ||
361 | unsigned char xclk, i2c_speed; | 362 | unsigned char xclk, i2c_speed; |
362 | 363 | ||