V4L/DVB (9037): Fix support for Hauppauge Nova-S SE
Different backends have different input busses (saa7146, flexcop). To reflect that a config-option to the s5h1420-driver was added which makes the output mode selectable. Furthermore the s5h1420-driver is now doing the same i2c-method as it was done before adding support for other i2c-users. This patch needs to go into the current release of the kernel, as this driver is currently broken. (Thanks to Eberhard Kaltenhaeuser for helping out to debug this issue.) Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
dda06a8e46
Коммит
c18c5ffe13
|
@ -491,6 +491,7 @@ static struct s5h1420_config skystar2_rev2_7_s5h1420_config = {
|
|||
.demod_address = 0x53,
|
||||
.invert = 1,
|
||||
.repeated_start_workaround = 1,
|
||||
.serial_mpeg = 1,
|
||||
};
|
||||
|
||||
static struct itd1000_config skystar2_rev2_7_itd1000_config = {
|
||||
|
|
|
@ -94,8 +94,11 @@ static u8 s5h1420_readreg(struct s5h1420_state *state, u8 reg)
|
|||
if (ret != 3)
|
||||
return ret;
|
||||
} else {
|
||||
ret = i2c_transfer(state->i2c, &msg[1], 2);
|
||||
if (ret != 2)
|
||||
ret = i2c_transfer(state->i2c, &msg[1], 1);
|
||||
if (ret != 1)
|
||||
return ret;
|
||||
ret = i2c_transfer(state->i2c, &msg[2], 1);
|
||||
if (ret != 1)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -823,7 +826,7 @@ static int s5h1420_init (struct dvb_frontend* fe)
|
|||
struct s5h1420_state* state = fe->demodulator_priv;
|
||||
|
||||
/* disable power down and do reset */
|
||||
state->CON_1_val = 0x10;
|
||||
state->CON_1_val = state->config->serial_mpeg << 4;
|
||||
s5h1420_writereg(state, 0x02, state->CON_1_val);
|
||||
msleep(10);
|
||||
s5h1420_reset(state);
|
||||
|
|
|
@ -32,10 +32,12 @@ struct s5h1420_config
|
|||
u8 demod_address;
|
||||
|
||||
/* does the inversion require inversion? */
|
||||
u8 invert : 1;
|
||||
u8 invert:1;
|
||||
|
||||
u8 repeated_start_workaround : 1;
|
||||
u8 cdclk_polarity : 1; /* 1 == falling edge, 0 == raising edge */
|
||||
u8 repeated_start_workaround:1;
|
||||
u8 cdclk_polarity:1; /* 1 == falling edge, 0 == raising edge */
|
||||
|
||||
u8 serial_mpeg:1;
|
||||
};
|
||||
|
||||
#if defined(CONFIG_DVB_S5H1420) || (defined(CONFIG_DVB_S5H1420_MODULE) && defined(MODULE))
|
||||
|
|
Загрузка…
Ссылка в новой задаче