summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-07-09 21:59:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:55:49 -0300
commitf1fe1b75d64046b693075045fe9fc5cafed9c981 (patch)
tree26669633735b8596e5ce88d27d27a2c7f4b3e42d /drivers/media
parentbbc70e647b04dc3df1c879089a4f6b633c1952c9 (diff)
[media] drxk: Allow to disable I2C Bridge control switch
On em28xx, tda18271C2 is accessible when the i2c port is not touched. Touching on it breaks the driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/drxk.h1
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.c3
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.h1
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c1
4 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/drxk.h b/drivers/media/dvb/frontends/drxk.h
index dd54512df2a5..9c99f31369ce 100644
--- a/drivers/media/dvb/frontends/drxk.h
+++ b/drivers/media/dvb/frontends/drxk.h
@@ -7,6 +7,7 @@
struct drxk_config {
u8 adr;
u32 single_master : 1;
+ u32 no_i2c_bridge : 1;
const char *microcode_name;
};
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index adb454a8eb7f..523352670e73 100644
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -2784,6 +2784,8 @@ static int ConfigureI2CBridge(struct drxk_state *state, bool bEnableBridge)
if (state->m_DrxkState == DRXK_POWERED_DOWN)
return -1;
+ if (state->no_i2c_bridge)
+ return 0;
do {
status = write16(state, SIO_HI_RA_RAM_PAR_1__A, SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY);
if (status < 0)
@@ -6360,6 +6362,7 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
state->demod_address = adr;
state->single_master = config->single_master;
state->microcode_name = config->microcode_name;
+ state->no_i2c_bridge = config->no_i2c_bridge;
mutex_init(&state->mutex);
mutex_init(&state->ctlock);
diff --git a/drivers/media/dvb/frontends/drxk_hard.h b/drivers/media/dvb/frontends/drxk_hard.h
index 8cdadce2646e..b042755188c4 100644
--- a/drivers/media/dvb/frontends/drxk_hard.h
+++ b/drivers/media/dvb/frontends/drxk_hard.h
@@ -330,6 +330,7 @@ struct drxk_state {
/* Configurable parameters at the driver */
u32 single_master : 1; /* Use single master i2c mode */
+ u32 no_i2c_bridge : 1; /* Tuner is not on port 1, don't use I2C bridge */
const char *microcode_name;
};
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 93f0af505b00..9b2be03c82e8 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -304,6 +304,7 @@ static struct drxd_config em28xx_drxd = {
struct drxk_config terratec_h5_drxk = {
.adr = 0x29,
.single_master = 1,
+ .no_i2c_bridge = 1,
.microcode_name = "terratec_h5.fw",
};