aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/dib7000p.c
diff options
context:
space:
mode:
authorMatt Doran <matt.doran@papercut.biz>2007-07-31 06:09:30 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:03:50 -0400
commit8f6956c7f9fa72c502bde47df4122bd32d0b86d5 (patch)
treeb2ebe02557ee2bcf7644fd406f93bcdcc271c431 /drivers/media/dvb/frontends/dib7000p.c
parent8779737b8e01b95fe6f1e33dc90ea621281c7b67 (diff)
V4L/DVB (5960): Add module parameter to enable SFN workaround
In some areas in the world the broadcasters are not using the same cellid for each transmitter in a SFN. The DiBcom has problems with that setup. The module parameter buggy_sfn_workaround makes it re-usable. Signed-off-by: Matt Doran <matt.doran@papercut.biz> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/dib7000p.c')
-rw-r--r--drivers/media/dvb/frontends/dib7000p.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 1175ab9a4532..aa7dc4503323 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -18,6 +18,10 @@ static int debug;
18module_param(debug, int, 0644); 18module_param(debug, int, 0644);
19MODULE_PARM_DESC(debug, "turn on debugging (default: 0)"); 19MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
20 20
21static int buggy_sfn_workaround;
22module_param(buggy_sfn_workaround, int, 0644);
23MODULE_PARM_DESC(debug, "Enable work-around for buggy SFNs (default: 0)");
24
21#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB7000P: "); printk(args); printk("\n"); } } while (0) 25#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB7000P: "); printk(args); printk("\n"); } } while (0)
22 26
23struct dib7000p_state { 27struct dib7000p_state {
@@ -44,6 +48,8 @@ struct dib7000p_state {
44 48
45 u16 gpio_dir; 49 u16 gpio_dir;
46 u16 gpio_val; 50 u16 gpio_val;
51
52 u8 sfn_workaround_active :1;
47}; 53};
48 54
49enum dib7000p_power_mode { 55enum dib7000p_power_mode {
@@ -751,8 +757,8 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
751 757
752 /* offset loop parameters */ 758 /* offset loop parameters */
753 dib7000p_write_word(state, 26, 0x6680); // timf(6xxx) 759 dib7000p_write_word(state, 26, 0x6680); // timf(6xxx)
754 dib7000p_write_word(state, 29, 0x1273); // isi inh1273 on1073
755 dib7000p_write_word(state, 32, 0x0003); // pha_off_max(xxx3) 760 dib7000p_write_word(state, 32, 0x0003); // pha_off_max(xxx3)
761 dib7000p_write_word(state, 29, 0x1273); // isi
756 dib7000p_write_word(state, 33, 0x0005); // sfreq(xxx5) 762 dib7000p_write_word(state, 33, 0x0005); // sfreq(xxx5)
757 763
758 /* P_dvsy_sync_wait */ 764 /* P_dvsy_sync_wait */
@@ -959,7 +965,15 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
959 msleep(45); 965 msleep(45);
960 966
961 /* P_ctrl_inh_cor=0, P_ctrl_alpha_cor=4, P_ctrl_inh_isi=0, P_ctrl_alpha_isi=3, P_ctrl_inh_cor4=1, P_ctrl_alpha_cor4=3 */ 967 /* P_ctrl_inh_cor=0, P_ctrl_alpha_cor=4, P_ctrl_inh_isi=0, P_ctrl_alpha_isi=3, P_ctrl_inh_cor4=1, P_ctrl_alpha_cor4=3 */
962 dib7000p_write_word(state, 29, (0 << 14) | (4 << 10) | (0 << 9) | (3 << 5) | (1 << 4) | (0x3)); 968 tmp = (0 << 14) | (4 << 10) | (0 << 9) | (3 << 5) | (1 << 4) | (0x3);
969 if (state->sfn_workaround_active) {
970 dprintk( "SFN workaround is active");
971 tmp |= (1 << 9);
972 dib7000p_write_word(state, 166, 0x4000); // P_pha3_force_pha_shift
973 } else {
974 dib7000p_write_word(state, 166, 0x0000); // P_pha3_force_pha_shift
975 }
976 dib7000p_write_word(state, 29, tmp);
963 977
964 // never achieved a lock with that bandwidth so far - wait for osc-freq to update 978 // never achieved a lock with that bandwidth so far - wait for osc-freq to update
965 if (state->timf == 0) 979 if (state->timf == 0)
@@ -1119,6 +1133,9 @@ static int dib7000p_set_frontend(struct dvb_frontend* fe,
1119 state->current_bandwidth = fep->u.ofdm.bandwidth; 1133 state->current_bandwidth = fep->u.ofdm.bandwidth;
1120 dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth)); 1134 dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth));
1121 1135
1136 /* maybe the parameter has been changed */
1137 state->sfn_workaround_active = buggy_sfn_workaround;
1138
1122 if (fe->ops.tuner_ops.set_params) 1139 if (fe->ops.tuner_ops.set_params)
1123 fe->ops.tuner_ops.set_params(fe, fep); 1140 fe->ops.tuner_ops.set_params(fe, fep);
1124 1141