aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2008-09-09 13:57:47 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:04 -0200
commitcc8c4f3a9c8dacff198438debd159ae4753744fc (patch)
tree7de1182075ed926596e35140007c77a8f71b31b9 /drivers/media
parent3f8e51add2b7d37f16343e6bdcc63862d87ccd04 (diff)
V4L/DVB (8994): Adjust MPEG initialization in cx24116
Adjust MPEG initialization in cx24116 in order to accomodate different MPEG CLK position and polarity in different cards. Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dw2102.c2
-rw-r--r--drivers/media/dvb/frontends/cx24116.c5
-rw-r--r--drivers/media/dvb/frontends/cx24116.h3
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index 0f3f962b35b..ad3d6fca9ab 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -284,7 +284,7 @@ static int dw2102_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
static struct cx24116_config dw2104_config = {
.demod_address = 0x55,
- /*.mpg_clk_pos_pol = 0x01,*/
+ .mpg_clk_pos_pol = 0x01,
};
static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index 2ff9e20c595..666a0d89e83 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -478,7 +478,10 @@ static int cx24116_load_firmware (struct dvb_frontend* fe, const struct firmware
cmd.args[0x01] = 0x01;
cmd.args[0x02] = 0x75;
cmd.args[0x03] = 0x00;
- cmd.args[0x04] = 0x02;
+ if (state->config->mpg_clk_pos_pol)
+ cmd.args[0x04] = state->config->mpg_clk_pos_pol;
+ else
+ cmd.args[0x04] = 0x02;
cmd.args[0x05] = 0x00;
cmd.len= 0x06;
ret = cx24116_cmd_execute(fe, &cmd);
diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb/frontends/cx24116.h
index 27896725204..8dbcec26839 100644
--- a/drivers/media/dvb/frontends/cx24116.h
+++ b/drivers/media/dvb/frontends/cx24116.h
@@ -33,6 +33,9 @@ struct cx24116_config
/* Need to reset device during firmware loading */
int (*reset_device)(struct dvb_frontend* fe);
+
+ /* Need to set MPEG parameters */
+ u8 mpg_clk_pos_pol:0x02;
};
#if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)