Commit f1fe1b75 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent bbc70e64
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
struct drxk_config { struct drxk_config {
u8 adr; u8 adr;
u32 single_master : 1; u32 single_master : 1;
u32 no_i2c_bridge : 1;
const char *microcode_name; const char *microcode_name;
}; };
......
...@@ -2784,6 +2784,8 @@ static int ConfigureI2CBridge(struct drxk_state *state, bool bEnableBridge) ...@@ -2784,6 +2784,8 @@ static int ConfigureI2CBridge(struct drxk_state *state, bool bEnableBridge)
if (state->m_DrxkState == DRXK_POWERED_DOWN) if (state->m_DrxkState == DRXK_POWERED_DOWN)
return -1; return -1;
if (state->no_i2c_bridge)
return 0;
do { do {
status = write16(state, SIO_HI_RA_RAM_PAR_1__A, SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY); status = write16(state, SIO_HI_RA_RAM_PAR_1__A, SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY);
if (status < 0) if (status < 0)
...@@ -6360,6 +6362,7 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config, ...@@ -6360,6 +6362,7 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
state->demod_address = adr; state->demod_address = adr;
state->single_master = config->single_master; state->single_master = config->single_master;
state->microcode_name = config->microcode_name; state->microcode_name = config->microcode_name;
state->no_i2c_bridge = config->no_i2c_bridge;
mutex_init(&state->mutex); mutex_init(&state->mutex);
mutex_init(&state->ctlock); mutex_init(&state->ctlock);
......
...@@ -330,6 +330,7 @@ struct drxk_state { ...@@ -330,6 +330,7 @@ struct drxk_state {
/* Configurable parameters at the driver */ /* Configurable parameters at the driver */
u32 single_master : 1; /* Use single master i2c mode */ 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; const char *microcode_name;
}; };
......
...@@ -304,6 +304,7 @@ static struct drxd_config em28xx_drxd = { ...@@ -304,6 +304,7 @@ static struct drxd_config em28xx_drxd = {
struct drxk_config terratec_h5_drxk = { struct drxk_config terratec_h5_drxk = {
.adr = 0x29, .adr = 0x29,
.single_master = 1, .single_master = 1,
.no_i2c_bridge = 1,
.microcode_name = "terratec_h5.fw", .microcode_name = "terratec_h5.fw",
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment