aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/dvb/frontends/dib7000p.c1950
-rw-r--r--drivers/media/dvb/frontends/dib7000p.h96
-rw-r--r--drivers/media/dvb/frontends/dibx000_common.h84
3 files changed, 1543 insertions, 587 deletions
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 6aa02cb80733..18495bd166e6 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -26,24 +26,29 @@ MODULE_PARM_DESC(buggy_sfn_workaround, "Enable work-around for buggy SFNs (defau
26 26
27#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB7000P: "); printk(args); printk("\n"); } } while (0) 27#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB7000P: "); printk(args); printk("\n"); } } while (0)
28 28
29struct i2c_device {
30 struct i2c_adapter *i2c_adap;
31 u8 i2c_addr;
32};
33
29struct dib7000p_state { 34struct dib7000p_state {
30 struct dvb_frontend demod; 35 struct dvb_frontend demod;
31 struct dib7000p_config cfg; 36 struct dib7000p_config cfg;
32 37
33 u8 i2c_addr; 38 u8 i2c_addr;
34 struct i2c_adapter *i2c_adap; 39 struct i2c_adapter *i2c_adap;
35 40
36 struct dibx000_i2c_master i2c_master; 41 struct dibx000_i2c_master i2c_master;
37 42
38 u16 wbd_ref; 43 u16 wbd_ref;
39 44
40 u8 current_band; 45 u8 current_band;
41 u32 current_bandwidth; 46 u32 current_bandwidth;
42 struct dibx000_agc_config *current_agc; 47 struct dibx000_agc_config *current_agc;
43 u32 timf; 48 u32 timf;
44 49
45 u8 div_force_off : 1; 50 u8 div_force_off:1;
46 u8 div_state : 1; 51 u8 div_state:1;
47 u16 div_sync_wait; 52 u16 div_sync_wait;
48 53
49 u8 agc_state; 54 u8 agc_state;
@@ -51,7 +56,13 @@ struct dib7000p_state {
51 u16 gpio_dir; 56 u16 gpio_dir;
52 u16 gpio_val; 57 u16 gpio_val;
53 58
54 u8 sfn_workaround_active :1; 59 u8 sfn_workaround_active:1;
60
61#define SOC7090 0x7090
62 u16 version;
63
64 u16 tuner_enable;
65 struct i2c_adapter dib7090_tuner_adap;
55}; 66};
56 67
57enum dib7000p_power_mode { 68enum dib7000p_power_mode {
@@ -60,17 +71,20 @@ enum dib7000p_power_mode {
60 DIB7000P_POWER_INTERFACE_ONLY, 71 DIB7000P_POWER_INTERFACE_ONLY,
61}; 72};
62 73
74static int dib7090_set_output_mode(struct dvb_frontend *fe, int mode);
75static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);
76
63static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg) 77static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)
64{ 78{
65 u8 wb[2] = { reg >> 8, reg & 0xff }; 79 u8 wb[2] = { reg >> 8, reg & 0xff };
66 u8 rb[2]; 80 u8 rb[2];
67 struct i2c_msg msg[2] = { 81 struct i2c_msg msg[2] = {
68 { .addr = state->i2c_addr >> 1, .flags = 0, .buf = wb, .len = 2 }, 82 {.addr = state->i2c_addr >> 1,.flags = 0,.buf = wb,.len = 2},
69 { .addr = state->i2c_addr >> 1, .flags = I2C_M_RD, .buf = rb, .len = 2 }, 83 {.addr = state->i2c_addr >> 1,.flags = I2C_M_RD,.buf = rb,.len = 2},
70 }; 84 };
71 85
72 if (i2c_transfer(state->i2c_adap, msg, 2) != 2) 86 if (i2c_transfer(state->i2c_adap, msg, 2) != 2)
73 dprintk("i2c read error on %d",reg); 87 dprintk("i2c read error on %d", reg);
74 88
75 return (rb[0] << 8) | rb[1]; 89 return (rb[0] << 8) | rb[1];
76} 90}
@@ -82,11 +96,12 @@ static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val)
82 (val >> 8) & 0xff, val & 0xff, 96 (val >> 8) & 0xff, val & 0xff,
83 }; 97 };
84 struct i2c_msg msg = { 98 struct i2c_msg msg = {
85 .addr = state->i2c_addr >> 1, .flags = 0, .buf = b, .len = 4 99 .addr = state->i2c_addr >> 1,.flags = 0,.buf = b,.len = 4
86 }; 100 };
87 return i2c_transfer(state->i2c_adap, &msg, 1) != 1 ? -EREMOTEIO : 0; 101 return i2c_transfer(state->i2c_adap, &msg, 1) != 1 ? -EREMOTEIO : 0;
88} 102}
89static void dib7000p_write_tab(struct dib7000p_state *state, u16 *buf) 103
104static void dib7000p_write_tab(struct dib7000p_state *state, u16 * buf)
90{ 105{
91 u16 l = 0, r, *n; 106 u16 l = 0, r, *n;
92 n = buf; 107 n = buf;
@@ -104,54 +119,54 @@ static void dib7000p_write_tab(struct dib7000p_state *state, u16 *buf)
104 119
105static int dib7000p_set_output_mode(struct dib7000p_state *state, int mode) 120static int dib7000p_set_output_mode(struct dib7000p_state *state, int mode)
106{ 121{
107 int ret = 0; 122 int ret = 0;
108 u16 outreg, fifo_threshold, smo_mode; 123 u16 outreg, fifo_threshold, smo_mode;
109 124
110 outreg = 0; 125 outreg = 0;
111 fifo_threshold = 1792; 126 fifo_threshold = 1792;
112 smo_mode = (dib7000p_read_word(state, 235) & 0x0050) | (1 << 1); 127 smo_mode = (dib7000p_read_word(state, 235) & 0x0050) | (1 << 1);
113 128
114 dprintk( "setting output mode for demod %p to %d", 129 dprintk("setting output mode for demod %p to %d", &state->demod, mode);
115 &state->demod, mode);
116 130
117 switch (mode) { 131 switch (mode) {
118 case OUTMODE_MPEG2_PAR_GATED_CLK: // STBs with parallel gated clock 132 case OUTMODE_MPEG2_PAR_GATED_CLK: // STBs with parallel gated clock
119 outreg = (1 << 10); /* 0x0400 */ 133 outreg = (1 << 10); /* 0x0400 */
120 break; 134 break;
121 case OUTMODE_MPEG2_PAR_CONT_CLK: // STBs with parallel continues clock 135 case OUTMODE_MPEG2_PAR_CONT_CLK: // STBs with parallel continues clock
122 outreg = (1 << 10) | (1 << 6); /* 0x0440 */ 136 outreg = (1 << 10) | (1 << 6); /* 0x0440 */
123 break; 137 break;
124 case OUTMODE_MPEG2_SERIAL: // STBs with serial input 138 case OUTMODE_MPEG2_SERIAL: // STBs with serial input
125 outreg = (1 << 10) | (2 << 6) | (0 << 1); /* 0x0480 */ 139 outreg = (1 << 10) | (2 << 6) | (0 << 1); /* 0x0480 */
126 break; 140 break;
127 case OUTMODE_DIVERSITY: 141 case OUTMODE_DIVERSITY:
128 if (state->cfg.hostbus_diversity) 142 if (state->cfg.hostbus_diversity)
129 outreg = (1 << 10) | (4 << 6); /* 0x0500 */ 143 outreg = (1 << 10) | (4 << 6); /* 0x0500 */
130 else 144 else
131 outreg = (1 << 11); 145 outreg = (1 << 11);
132 break; 146 break;
133 case OUTMODE_MPEG2_FIFO: // e.g. USB feeding 147 case OUTMODE_MPEG2_FIFO: // e.g. USB feeding
134 smo_mode |= (3 << 1); 148 smo_mode |= (3 << 1);
135 fifo_threshold = 512; 149 fifo_threshold = 512;
136 outreg = (1 << 10) | (5 << 6); 150 outreg = (1 << 10) | (5 << 6);
137 break; 151 break;
138 case OUTMODE_ANALOG_ADC: 152 case OUTMODE_ANALOG_ADC:
139 outreg = (1 << 10) | (3 << 6); 153 outreg = (1 << 10) | (3 << 6);
140 break; 154 break;
141 case OUTMODE_HIGH_Z: // disable 155 case OUTMODE_HIGH_Z: // disable
142 outreg = 0; 156 outreg = 0;
143 break; 157 break;
144 default: 158 default:
145 dprintk( "Unhandled output_mode passed to be set for demod %p",&state->demod); 159 dprintk("Unhandled output_mode passed to be set for demod %p", &state->demod);
146 break; 160 break;
147 } 161 }
148 162
149 if (state->cfg.output_mpeg2_in_188_bytes) 163 if (state->cfg.output_mpeg2_in_188_bytes)
150 smo_mode |= (1 << 5) ; 164 smo_mode |= (1 << 5);
151 165
152 ret |= dib7000p_write_word(state, 235, smo_mode); 166 ret |= dib7000p_write_word(state, 235, smo_mode);
153 ret |= dib7000p_write_word(state, 236, fifo_threshold); /* synchronous fread */ 167 ret |= dib7000p_write_word(state, 236, fifo_threshold); /* synchronous fread */
154 ret |= dib7000p_write_word(state, 1286, outreg); /* P_Div_active */ 168 if (state->version != SOC7090)
169 ret |= dib7000p_write_word(state, 1286, outreg); /* P_Div_active */
155 170
156 return ret; 171 return ret;
157} 172}
@@ -161,13 +176,13 @@ static int dib7000p_set_diversity_in(struct dvb_frontend *demod, int onoff)
161 struct dib7000p_state *state = demod->demodulator_priv; 176 struct dib7000p_state *state = demod->demodulator_priv;
162 177
163 if (state->div_force_off) { 178 if (state->div_force_off) {
164 dprintk( "diversity combination deactivated - forced by COFDM parameters"); 179 dprintk("diversity combination deactivated - forced by COFDM parameters");
165 onoff = 0; 180 onoff = 0;
166 dib7000p_write_word(state, 207, 0); 181 dib7000p_write_word(state, 207, 0);
167 } else 182 } else
168 dib7000p_write_word(state, 207, (state->div_sync_wait << 4) | (1 << 2) | (2 << 0)); 183 dib7000p_write_word(state, 207, (state->div_sync_wait << 4) | (1 << 2) | (2 << 0));
169 184
170 state->div_state = (u8)onoff; 185 state->div_state = (u8) onoff;
171 186
172 if (onoff) { 187 if (onoff) {
173 dib7000p_write_word(state, 204, 6); 188 dib7000p_write_word(state, 204, 6);
@@ -184,37 +199,48 @@ static int dib7000p_set_diversity_in(struct dvb_frontend *demod, int onoff)
184static int dib7000p_set_power_mode(struct dib7000p_state *state, enum dib7000p_power_mode mode) 199static int dib7000p_set_power_mode(struct dib7000p_state *state, enum dib7000p_power_mode mode)
185{ 200{
186 /* by default everything is powered off */ 201 /* by default everything is powered off */
187 u16 reg_774 = 0xffff, reg_775 = 0xffff, reg_776 = 0x0007, reg_899 = 0x0003, 202 u16 reg_774 = 0x3fff, reg_775 = 0xffff, reg_776 = 0x0007, reg_899 = 0x0003, reg_1280 = (0xfe00) | (dib7000p_read_word(state, 1280) & 0x01ff);
188 reg_1280 = (0xfe00) | (dib7000p_read_word(state, 1280) & 0x01ff);
189 203
190 /* now, depending on the requested mode, we power on */ 204 /* now, depending on the requested mode, we power on */
191 switch (mode) { 205 switch (mode) {
192 /* power up everything in the demod */ 206 /* power up everything in the demod */
193 case DIB7000P_POWER_ALL: 207 case DIB7000P_POWER_ALL:
194 reg_774 = 0x0000; reg_775 = 0x0000; reg_776 = 0x0; reg_899 = 0x0; reg_1280 &= 0x01ff; 208 reg_774 = 0x0000;
195 break; 209 reg_775 = 0x0000;
196 210 reg_776 = 0x0;
197 case DIB7000P_POWER_ANALOG_ADC: 211 reg_899 = 0x0;
198 /* dem, cfg, iqc, sad, agc */ 212 if (state->version == SOC7090)
199 reg_774 &= ~((1 << 15) | (1 << 14) | (1 << 11) | (1 << 10) | (1 << 9)); 213 reg_1280 &= 0x001f;
200 /* nud */ 214 else
201 reg_776 &= ~((1 << 0)); 215 reg_1280 &= 0x01ff;
202 /* Dout */ 216 break;
217
218 case DIB7000P_POWER_ANALOG_ADC:
219 /* dem, cfg, iqc, sad, agc */
220 reg_774 &= ~((1 << 15) | (1 << 14) | (1 << 11) | (1 << 10) | (1 << 9));
221 /* nud */
222 reg_776 &= ~((1 << 0));
223 /* Dout */
224 if (state->version != SOC7090)
203 reg_1280 &= ~((1 << 11)); 225 reg_1280 &= ~((1 << 11));
204 /* fall through wanted to enable the interfaces */ 226 reg_1280 &= ~(1 << 6);
227 /* fall through wanted to enable the interfaces */
205 228
206 /* just leave power on the control-interfaces: GPIO and (I2C or SDIO) */ 229 /* just leave power on the control-interfaces: GPIO and (I2C or SDIO) */
207 case DIB7000P_POWER_INTERFACE_ONLY: /* TODO power up either SDIO or I2C */ 230 case DIB7000P_POWER_INTERFACE_ONLY: /* TODO power up either SDIO or I2C */
231 if (state->version == SOC7090)
232 reg_1280 &= ~((1 << 7) | (1 << 5));
233 else
208 reg_1280 &= ~((1 << 14) | (1 << 13) | (1 << 12) | (1 << 10)); 234 reg_1280 &= ~((1 << 14) | (1 << 13) | (1 << 12) | (1 << 10));
209 break; 235 break;
210 236
211/* TODO following stuff is just converted from the dib7000-driver - check when is used what */ 237/* TODO following stuff is just converted from the dib7000-driver - check when is used what */
212 } 238 }
213 239
214 dib7000p_write_word(state, 774, reg_774); 240 dib7000p_write_word(state, 774, reg_774);
215 dib7000p_write_word(state, 775, reg_775); 241 dib7000p_write_word(state, 775, reg_775);
216 dib7000p_write_word(state, 776, reg_776); 242 dib7000p_write_word(state, 776, reg_776);
217 dib7000p_write_word(state, 899, reg_899); 243 dib7000p_write_word(state, 899, reg_899);
218 dib7000p_write_word(state, 1280, reg_1280); 244 dib7000p_write_word(state, 1280, reg_1280);
219 245
220 return 0; 246 return 0;
@@ -222,40 +248,57 @@ static int dib7000p_set_power_mode(struct dib7000p_state *state, enum dib7000p_p
222 248
223static void dib7000p_set_adc_state(struct dib7000p_state *state, enum dibx000_adc_states no) 249static void dib7000p_set_adc_state(struct dib7000p_state *state, enum dibx000_adc_states no)
224{ 250{
225 u16 reg_908 = dib7000p_read_word(state, 908), 251 u16 reg_908 = dib7000p_read_word(state, 908), reg_909 = dib7000p_read_word(state, 909);
226 reg_909 = dib7000p_read_word(state, 909); 252 u16 reg;
227 253
228 switch (no) { 254 switch (no) {
229 case DIBX000_SLOW_ADC_ON: 255 case DIBX000_SLOW_ADC_ON:
256 if (state->version == SOC7090) {
257 reg = dib7000p_read_word(state, 1925);
258
259 dib7000p_write_word(state, 1925, reg | (1 << 4) | (1 << 2)); /* en_slowAdc = 1 & reset_sladc = 1 */
260
261 reg = dib7000p_read_word(state, 1925); /* read acces to make it works... strange ... */
262 msleep(200);
263 dib7000p_write_word(state, 1925, reg & ~(1 << 4)); /* en_slowAdc = 1 & reset_sladc = 0 */
264
265 reg = dib7000p_read_word(state, 72) & ~((0x3 << 14) | (0x3 << 12));
266 dib7000p_write_word(state, 72, reg | (1 << 14) | (3 << 12) | 524); /* ref = Vin1 => Vbg ; sel = Vin0 or Vin3 ; (Vin2 = Vcm) */
267 } else {
230 reg_909 |= (1 << 1) | (1 << 0); 268 reg_909 |= (1 << 1) | (1 << 0);
231 dib7000p_write_word(state, 909, reg_909); 269 dib7000p_write_word(state, 909, reg_909);
232 reg_909 &= ~(1 << 1); 270 reg_909 &= ~(1 << 1);
233 break; 271 }
272 break;
234 273
235 case DIBX000_SLOW_ADC_OFF: 274 case DIBX000_SLOW_ADC_OFF:
236 reg_909 |= (1 << 1) | (1 << 0); 275 if (state->version == SOC7090) {
237 break; 276 reg = dib7000p_read_word(state, 1925);
277 dib7000p_write_word(state, 1925, (reg & ~(1 << 2)) | (1 << 4)); /* reset_sladc = 1 en_slowAdc = 0 */
278 } else
279 reg_909 |= (1 << 1) | (1 << 0);
280 break;
238 281
239 case DIBX000_ADC_ON: 282 case DIBX000_ADC_ON:
240 reg_908 &= 0x0fff; 283 reg_908 &= 0x0fff;
241 reg_909 &= 0x0003; 284 reg_909 &= 0x0003;
242 break; 285 break;
243 286
244 case DIBX000_ADC_OFF: // leave the VBG voltage on 287 case DIBX000_ADC_OFF: // leave the VBG voltage on
245 reg_908 |= (1 << 14) | (1 << 13) | (1 << 12); 288 reg_908 |= (1 << 14) | (1 << 13) | (1 << 12);
246 reg_909 |= (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2); 289 reg_909 |= (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2);
247 break; 290 break;
248 291
249 case DIBX000_VBG_ENABLE: 292 case DIBX000_VBG_ENABLE:
250 reg_908 &= ~(1 << 15); 293 reg_908 &= ~(1 << 15);
251 break; 294 break;
252 295
253 case DIBX000_VBG_DISABLE: 296 case DIBX000_VBG_DISABLE:
254 reg_908 |= (1 << 15); 297 reg_908 |= (1 << 15);
255 break; 298 break;
256 299
257 default: 300 default:
258 break; 301 break;
259 } 302 }
260 303
261// dprintk( "908: %x, 909: %x\n", reg_908, reg_909); 304// dprintk( "908: %x, 909: %x\n", reg_908, reg_909);
@@ -275,17 +318,17 @@ static int dib7000p_set_bandwidth(struct dib7000p_state *state, u32 bw)
275 state->current_bandwidth = bw; 318 state->current_bandwidth = bw;
276 319
277 if (state->timf == 0) { 320 if (state->timf == 0) {
278 dprintk( "using default timf"); 321 dprintk("using default timf");
279 timf = state->cfg.bw->timf; 322 timf = state->cfg.bw->timf;
280 } else { 323 } else {
281 dprintk( "using updated timf"); 324 dprintk("using updated timf");
282 timf = state->timf; 325 timf = state->timf;
283 } 326 }
284 327
285 timf = timf * (bw / 50) / 160; 328 timf = timf * (bw / 50) / 160;
286 329
287 dib7000p_write_word(state, 23, (u16) ((timf >> 16) & 0xffff)); 330 dib7000p_write_word(state, 23, (u16) ((timf >> 16) & 0xffff));
288 dib7000p_write_word(state, 24, (u16) ((timf ) & 0xffff)); 331 dib7000p_write_word(state, 24, (u16) ((timf) & 0xffff));
289 332
290 return 0; 333 return 0;
291} 334}
@@ -295,7 +338,11 @@ static int dib7000p_sad_calib(struct dib7000p_state *state)
295/* internal */ 338/* internal */
296// dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth 339// dib7000p_write_word(state, 72, (3 << 14) | (1 << 12) | (524 << 0)); // sampling clock of the SAD is writting in set_bandwidth
297 dib7000p_write_word(state, 73, (0 << 1) | (0 << 0)); 340 dib7000p_write_word(state, 73, (0 << 1) | (0 << 0));
298 dib7000p_write_word(state, 74, 776); // 0.625*3.3 / 4096 341
342 if (state->version == SOC7090)
343 dib7000p_write_word(state, 74, 2048); // P_sad_calib_value = (0.9/1.8)*4096
344 else
345 dib7000p_write_word(state, 74, 776); // P_sad_calib_value = 0.625*3.3 / 4096
299 346
300 /* do the calibration */ 347 /* do the calibration */
301 dib7000p_write_word(state, 73, (1 << 0)); 348 dib7000p_write_word(state, 73, (1 << 0));
@@ -314,37 +361,92 @@ int dib7000p_set_wbd_ref(struct dvb_frontend *demod, u16 value)
314 state->wbd_ref = value; 361 state->wbd_ref = value;
315 return dib7000p_write_word(state, 105, (dib7000p_read_word(state, 105) & 0xf000) | value); 362 return dib7000p_write_word(state, 105, (dib7000p_read_word(state, 105) & 0xf000) | value);
316} 363}
317
318EXPORT_SYMBOL(dib7000p_set_wbd_ref); 364EXPORT_SYMBOL(dib7000p_set_wbd_ref);
365
319static void dib7000p_reset_pll(struct dib7000p_state *state) 366static void dib7000p_reset_pll(struct dib7000p_state *state)
320{ 367{
321 struct dibx000_bandwidth_config *bw = &state->cfg.bw[0]; 368 struct dibx000_bandwidth_config *bw = &state->cfg.bw[0];
322 u16 clk_cfg0; 369 u16 clk_cfg0;
323 370
324 /* force PLL bypass */ 371 if (state->version == SOC7090) {
325 clk_cfg0 = (1 << 15) | ((bw->pll_ratio & 0x3f) << 9) | 372 dib7000p_write_word(state, 1856, (!bw->pll_reset << 13) | (bw->pll_range << 12) | (bw->pll_ratio << 6) | (bw->pll_prediv));
326 (bw->modulo << 7) | (bw->ADClkSrc << 6) | (bw->IO_CLK_en_core << 5) |
327 (bw->bypclk_div << 2) | (bw->enable_refdiv << 1) | (0 << 0);
328 373
329 dib7000p_write_word(state, 900, clk_cfg0); 374 while (((dib7000p_read_word(state, 1856) >> 15) & 0x1) != 1) {
375 }
376
377 dib7000p_write_word(state, 1857, dib7000p_read_word(state, 1857) | (!bw->pll_bypass << 15));
378 } else {
379 /* force PLL bypass */
380 clk_cfg0 = (1 << 15) | ((bw->pll_ratio & 0x3f) << 9) |
381 (bw->modulo << 7) | (bw->ADClkSrc << 6) | (bw->IO_CLK_en_core << 5) | (bw->bypclk_div << 2) | (bw->enable_refdiv << 1) | (0 << 0);
330 382
331 /* P_pll_cfg */ 383 dib7000p_write_word(state, 900, clk_cfg0);
332 dib7000p_write_word(state, 903, (bw->pll_prediv << 5) | (((bw->pll_ratio >> 6) & 0x3) << 3) | (bw->pll_range << 1) | bw->pll_reset); 384
333 clk_cfg0 = (bw->pll_bypass << 15) | (clk_cfg0 & 0x7fff); 385 /* P_pll_cfg */
334 dib7000p_write_word(state, 900, clk_cfg0); 386 dib7000p_write_word(state, 903, (bw->pll_prediv << 5) | (((bw->pll_ratio >> 6) & 0x3) << 3) | (bw->pll_range << 1) | bw->pll_reset);
387 clk_cfg0 = (bw->pll_bypass << 15) | (clk_cfg0 & 0x7fff);
388 dib7000p_write_word(state, 900, clk_cfg0);
389 }
335 390
336 dib7000p_write_word(state, 18, (u16) (((bw->internal*1000) >> 16) & 0xffff)); 391 dib7000p_write_word(state, 18, (u16) (((bw->internal * 1000) >> 16) & 0xffff));
337 dib7000p_write_word(state, 19, (u16) ( (bw->internal*1000 ) & 0xffff)); 392 dib7000p_write_word(state, 19, (u16) ((bw->internal * 1000) & 0xffff));
338 dib7000p_write_word(state, 21, (u16) ( (bw->ifreq >> 16) & 0xffff)); 393 dib7000p_write_word(state, 21, (u16) ((bw->ifreq >> 16) & 0xffff));
339 dib7000p_write_word(state, 22, (u16) ( (bw->ifreq ) & 0xffff)); 394 dib7000p_write_word(state, 22, (u16) ((bw->ifreq) & 0xffff));
340 395
341 dib7000p_write_word(state, 72, bw->sad_cfg); 396 dib7000p_write_word(state, 72, bw->sad_cfg);
342} 397}
343 398
399static u32 dib7000p_get_internal_freq(struct dib7000p_state *state)
400{
401 u32 internal = (u32) dib7000p_read_word(state, 18) << 16;
402 internal |= (u32) dib7000p_read_word(state, 19);
403 internal /= 1000;
404
405 return internal;
406}
407
408int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth_config *bw)
409{
410 struct dib7000p_state *state = fe->demodulator_priv;
411 u16 reg_1857, reg_1856 = dib7000p_read_word(state, 1856);
412 u8 loopdiv, prediv;
413 u32 internal, xtal;
414
415 /* get back old values */
416 prediv = reg_1856 & 0x3f;
417 loopdiv = (reg_1856 >> 6) & 0x3f;
418
419 if ((bw != NULL) && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) {
420 dprintk("Updating pll (prediv: old = %d new = %d ; loopdiv : old = %d new = %d)", prediv, bw->pll_prediv, loopdiv, bw->pll_ratio);
421 reg_1856 &= 0xf000;
422 reg_1857 = dib7000p_read_word(state, 1857);
423 dib7000p_write_word(state, 1857, reg_1857 & ~(1 << 15)); // desable pll
424
425 dib7000p_write_word(state, 1856, reg_1856 | ((bw->pll_ratio & 0x3f) << 6) | (bw->pll_prediv & 0x3f));
426
427 /* write new system clk into P_sec_len */
428 internal = dib7000p_get_internal_freq(state);
429 xtal = (internal / loopdiv) * prediv;
430 internal = 1000 * (xtal / bw->pll_prediv) * bw->pll_ratio; /* new internal */
431 dib7000p_write_word(state, 18, (u16) ((internal >> 16) & 0xffff));
432 dib7000p_write_word(state, 19, (u16) (internal & 0xffff));
433
434 dib7000p_write_word(state, 1857, reg_1857 | (1 << 15)); // enable pll
435
436 while (((dib7000p_read_word(state, 1856) >> 15) & 0x1) != 1) {
437 dprintk("Waiting for PLL to lock");
438 }
439
440 return 0;
441 }
442 return -EIO;
443}
444EXPORT_SYMBOL(dib7000p_update_pll);
445
344static int dib7000p_reset_gpio(struct dib7000p_state *st) 446static int dib7000p_reset_gpio(struct dib7000p_state *st)
345{ 447{
346 /* reset the GPIOs */ 448 /* reset the GPIOs */
347 dprintk( "gpio dir: %x: val: %x, pwm_pos: %x",st->gpio_dir, st->gpio_val,st->cfg.gpio_pwm_pos); 449 dprintk("gpio dir: %x: val: %x, pwm_pos: %x", st->gpio_dir, st->gpio_val, st->cfg.gpio_pwm_pos);
348 450
349 dib7000p_write_word(st, 1029, st->gpio_dir); 451 dib7000p_write_word(st, 1029, st->gpio_dir);
350 dib7000p_write_word(st, 1030, st->gpio_val); 452 dib7000p_write_word(st, 1030, st->gpio_val);
@@ -360,13 +462,13 @@ static int dib7000p_reset_gpio(struct dib7000p_state *st)
360static int dib7000p_cfg_gpio(struct dib7000p_state *st, u8 num, u8 dir, u8 val) 462static int dib7000p_cfg_gpio(struct dib7000p_state *st, u8 num, u8 dir, u8 val)
361{ 463{
362 st->gpio_dir = dib7000p_read_word(st, 1029); 464 st->gpio_dir = dib7000p_read_word(st, 1029);
363 st->gpio_dir &= ~(1 << num); /* reset the direction bit */ 465 st->gpio_dir &= ~(1 << num); /* reset the direction bit */
364 st->gpio_dir |= (dir & 0x1) << num; /* set the new direction */ 466 st->gpio_dir |= (dir & 0x1) << num; /* set the new direction */
365 dib7000p_write_word(st, 1029, st->gpio_dir); 467 dib7000p_write_word(st, 1029, st->gpio_dir);
366 468
367 st->gpio_val = dib7000p_read_word(st, 1030); 469 st->gpio_val = dib7000p_read_word(st, 1030);
368 st->gpio_val &= ~(1 << num); /* reset the direction bit */ 470 st->gpio_val &= ~(1 << num); /* reset the direction bit */
369 st->gpio_val |= (val & 0x01) << num; /* set the new value */ 471 st->gpio_val |= (val & 0x01) << num; /* set the new value */
370 dib7000p_write_word(st, 1030, st->gpio_val); 472 dib7000p_write_word(st, 1030, st->gpio_val);
371 473
372 return 0; 474 return 0;
@@ -377,96 +479,97 @@ int dib7000p_set_gpio(struct dvb_frontend *demod, u8 num, u8 dir, u8 val)
377 struct dib7000p_state *state = demod->demodulator_priv; 479 struct dib7000p_state *state = demod->demodulator_priv;
378 return dib7000p_cfg_gpio(state, num, dir, val); 480 return dib7000p_cfg_gpio(state, num, dir, val);
379} 481}
380
381EXPORT_SYMBOL(dib7000p_set_gpio); 482EXPORT_SYMBOL(dib7000p_set_gpio);
382static u16 dib7000p_defaults[] =
383 483
384{ 484static u16 dib7000p_defaults[] = {
385 // auto search configuration 485 // auto search configuration
386 3, 2, 486 3, 2,
387 0x0004, 487 0x0004,
388 0x1000, 488 0x1000,
389 0x0814, /* Equal Lock */ 489 0x0814, /* Equal Lock */
390 490
391 12, 6, 491 12, 6,
392 0x001b, 492 0x001b,
393 0x7740, 493 0x7740,
394 0x005b, 494 0x005b,
395 0x8d80, 495 0x8d80,
396 0x01c9, 496 0x01c9,
397 0xc380, 497 0xc380,
398 0x0000, 498 0x0000,
399 0x0080, 499 0x0080,
400 0x0000, 500 0x0000,
401 0x0090, 501 0x0090,
402 0x0001, 502 0x0001,
403 0xd4c0, 503 0xd4c0,
404 504
405 1, 26, 505 1, 26,
406 0x6680, // P_timf_alpha=6, P_corm_alpha=6, P_corm_thres=128 default: 6,4,26 506 0x6680, // P_timf_alpha=6, P_corm_alpha=6, P_corm_thres=128 default: 6,4,26
407 507
408 /* set ADC level to -16 */ 508 /* set ADC level to -16 */
409 11, 79, 509 11, 79,
410 (1 << 13) - 825 - 117, 510 (1 << 13) - 825 - 117,
411 (1 << 13) - 837 - 117, 511 (1 << 13) - 837 - 117,
412 (1 << 13) - 811 - 117, 512 (1 << 13) - 811 - 117,
413 (1 << 13) - 766 - 117, 513 (1 << 13) - 766 - 117,
414 (1 << 13) - 737 - 117, 514 (1 << 13) - 737 - 117,
415 (1 << 13) - 693 - 117, 515 (1 << 13) - 693 - 117,
416 (1 << 13) - 648 - 117, 516 (1 << 13) - 648 - 117,
417 (1 << 13) - 619 - 117, 517 (1 << 13) - 619 - 117,
418 (1 << 13) - 575 - 117, 518 (1 << 13) - 575 - 117,
419 (1 << 13) - 531 - 117, 519 (1 << 13) - 531 - 117,
420 (1 << 13) - 501 - 117, 520 (1 << 13) - 501 - 117,
421 521
422 1, 142, 522 1, 142,
423 0x0410, // P_palf_filter_on=1, P_palf_filter_freeze=0, P_palf_alpha_regul=16 523 0x0410, // P_palf_filter_on=1, P_palf_filter_freeze=0, P_palf_alpha_regul=16
424 524
425 /* disable power smoothing */ 525 /* disable power smoothing */
426 8, 145, 526 8, 145,
427 0, 527 0,
428 0, 528 0,
429 0, 529 0,
430 0, 530 0,
431 0, 531 0,
432 0, 532 0,
433 0, 533 0,
434 0, 534 0,
435 535
436 1, 154, 536 1, 154,
437 1 << 13, // P_fft_freq_dir=1, P_fft_nb_to_cut=0 537 1 << 13, // P_fft_freq_dir=1, P_fft_nb_to_cut=0
438 538
439 1, 168, 539 1, 168,
440 0x0ccd, // P_pha3_thres, default 0x3000 540 0x0ccd, // P_pha3_thres, default 0x3000
441 541
442// 1, 169, 542// 1, 169,
443// 0x0010, // P_cti_use_cpe=0, P_cti_use_prog=0, P_cti_win_len=16, default: 0x0010 543// 0x0010, // P_cti_use_cpe=0, P_cti_use_prog=0, P_cti_win_len=16, default: 0x0010
444 544
445 1, 183, 545 1, 183,
446 0x200f, // P_cspu_regul=512, P_cspu_win_cut=15, default: 0x2005 546 0x200f, // P_cspu_regul=512, P_cspu_win_cut=15, default: 0x2005
547
548 1, 212,
549 0x169, // P_vit_ksi_dwn = 5 P_vit_ksi_up = 5 0x1e1, // P_vit_ksi_dwn = 4 P_vit_ksi_up = 7
447 550
448 5, 187, 551 5, 187,
449 0x023d, // P_adp_regul_cnt=573, default: 410 552 0x023d, // P_adp_regul_cnt=573, default: 410
450 0x00a4, // P_adp_noise_cnt= 553 0x00a4, // P_adp_noise_cnt=
451 0x00a4, // P_adp_regul_ext 554 0x00a4, // P_adp_regul_ext
452 0x7ff0, // P_adp_noise_ext 555 0x7ff0, // P_adp_noise_ext
453 0x3ccc, // P_adp_fil 556 0x3ccc, // P_adp_fil
454 557
455 1, 198, 558 1, 198,
456 0x800, // P_equal_thres_wgn 559 0x800, // P_equal_thres_wgn
457 560
458 1, 222, 561 1, 222,
459 0x0010, // P_fec_ber_rs_len=2 562 0x0010, // P_fec_ber_rs_len=2
460 563
461 1, 235, 564 1, 235,
462 0x0062, // P_smo_mode, P_smo_rs_discard, P_smo_fifo_flush, P_smo_pid_parse, P_smo_error_discard 565 0x0062, // P_smo_mode, P_smo_rs_discard, P_smo_fifo_flush, P_smo_pid_parse, P_smo_error_discard
463 566
464 2, 901, 567 2, 901,
465 0x0006, // P_clk_cfg1 568 0x0006, // P_clk_cfg1
466 (3 << 10) | (1 << 6), // P_divclksel=3 P_divbitsel=1 569 (3 << 10) | (1 << 6), // P_divclksel=3 P_divbitsel=1
467 570
468 1, 905, 571 1, 905,
469 0x2c8e, // Tuner IO bank: max drive (14mA) + divout pads max drive 572 0x2c8e, // Tuner IO bank: max drive (14mA) + divout pads max drive
470 573
471 0, 574 0,
472}; 575};
@@ -475,51 +578,65 @@ static int dib7000p_demod_reset(struct dib7000p_state *state)
475{ 578{
476 dib7000p_set_power_mode(state, DIB7000P_POWER_ALL); 579 dib7000p_set_power_mode(state, DIB7000P_POWER_ALL);
477 580
581 if (state->version == SOC7090)
582 dibx000_reset_i2c_master(&state->i2c_master);
583
478 dib7000p_set_adc_state(state, DIBX000_VBG_ENABLE); 584 dib7000p_set_adc_state(state, DIBX000_VBG_ENABLE);
479 585
480 /* restart all parts */ 586 /* restart all parts */
481 dib7000p_write_word(state, 770, 0xffff); 587 dib7000p_write_word(state, 770, 0xffff);
482 dib7000p_write_word(state, 771, 0xffff); 588 dib7000p_write_word(state, 771, 0xffff);
483 dib7000p_write_word(state, 772, 0x001f); 589 dib7000p_write_word(state, 772, 0x001f);
484 dib7000p_write_word(state, 898, 0x0003); 590 dib7000p_write_word(state, 898, 0x0003);
485 /* except i2c, sdio, gpio - control interfaces */ 591 dib7000p_write_word(state, 1280, 0x001f - ((1 << 4) | (1 << 3)));
486 dib7000p_write_word(state, 1280, 0x01fc - ((1 << 7) | (1 << 6) | (1 << 5)) ); 592
487 593 dib7000p_write_word(state, 770, 0);
488 dib7000p_write_word(state, 770, 0); 594 dib7000p_write_word(state, 771, 0);
489 dib7000p_write_word(state, 771, 0); 595 dib7000p_write_word(state, 772, 0);
490 dib7000p_write_word(state, 772, 0); 596 dib7000p_write_word(state, 898, 0);
491 dib7000p_write_word(state, 898, 0);
492 dib7000p_write_word(state, 1280, 0); 597 dib7000p_write_word(state, 1280, 0);
493 598
494 /* default */ 599 /* default */
495 dib7000p_reset_pll(state); 600 dib7000p_reset_pll(state);
496 601
497 if (dib7000p_reset_gpio(state) != 0) 602 if (dib7000p_reset_gpio(state) != 0)
498 dprintk( "GPIO reset was not successful."); 603 dprintk("GPIO reset was not successful.");
499 604
500 if (dib7000p_set_output_mode(state, OUTMODE_HIGH_Z) != 0) 605 if (state->version == SOC7090) {
501 dprintk( "OUTPUT_MODE could not be reset."); 606 dib7000p_write_word(state, 899, 0);
502 607
503 /* unforce divstr regardless whether i2c enumeration was done or not */ 608 /* impulse noise */
504 dib7000p_write_word(state, 1285, dib7000p_read_word(state, 1285) & ~(1 << 1) ); 609 dib7000p_write_word(state, 42, (1<<5) | 3); /* P_iqc_thsat_ipc = 1 ; P_iqc_win2 = 3 */
505 610 dib7000p_write_word(state, 43, 0x2d4); /*-300 fag P_iqc_dect_min = -280 */
506 dib7000p_set_bandwidth(state, 8000); 611 dib7000p_write_word(state, 44, 300); /* 300 fag P_iqc_dect_min = +280 */
612 //dib7000p_write_word(state, 273, (1<<6) | 10); /* P_vit_inoise_sel = 1, P_vit_inoise_gain = 10*/
613 dib7000p_write_word(state, 273, (1<<6) | 30); //26/* P_vit_inoise_sel = 1, P_vit_inoise_gain = 26*/// FAG
614 }
615 if (dib7000p_set_output_mode(state, OUTMODE_HIGH_Z) != 0)
616 dprintk("OUTPUT_MODE could not be reset.");
507 617
508 dib7000p_set_adc_state(state, DIBX000_SLOW_ADC_ON); 618 dib7000p_set_adc_state(state, DIBX000_SLOW_ADC_ON);
509 dib7000p_sad_calib(state); 619 dib7000p_sad_calib(state);
510 dib7000p_set_adc_state(state, DIBX000_SLOW_ADC_OFF); 620 dib7000p_set_adc_state(state, DIBX000_SLOW_ADC_OFF);
511 621
512 // P_iqc_alpha_pha, P_iqc_alpha_amp_dcc_alpha, ... 622 /* unforce divstr regardless whether i2c enumeration was done or not */
513 if(state->cfg.tuner_is_baseband) 623 dib7000p_write_word(state, 1285, dib7000p_read_word(state, 1285) & ~(1 << 1));
514 dib7000p_write_word(state, 36,0x0755); 624
515 else 625 dib7000p_set_bandwidth(state, 8000);
516 dib7000p_write_word(state, 36,0x1f55); 626
627 if(state->version == SOC7090) {
628 dib7000p_write_word(state, 36, 0x5755);/* P_iqc_impnc_on =1 & P_iqc_corr_inh = 1 for impulsive noise */
629 } else { // P_iqc_alpha_pha, P_iqc_alpha_amp_dcc_alpha, ...
630 if (state->cfg.tuner_is_baseband)
631 dib7000p_write_word(state, 36, 0x0755);
632 else
633 dib7000p_write_word(state, 36, 0x1f55);
634 }
517 635
518 dib7000p_write_tab(state, dib7000p_defaults); 636 dib7000p_write_tab(state, dib7000p_defaults);
519 637
520 dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY); 638 dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);
521 639
522
523 return 0; 640 return 0;
524} 641}
525 642
@@ -527,9 +644,9 @@ static void dib7000p_pll_clk_cfg(struct dib7000p_state *state)
527{ 644{
528 u16 tmp = 0; 645 u16 tmp = 0;
529 tmp = dib7000p_read_word(state, 903); 646 tmp = dib7000p_read_word(state, 903);
530 dib7000p_write_word(state, 903, (tmp | 0x1)); //pwr-up pll 647 dib7000p_write_word(state, 903, (tmp | 0x1)); //pwr-up pll
531 tmp = dib7000p_read_word(state, 900); 648 tmp = dib7000p_read_word(state, 900);
532 dib7000p_write_word(state, 900, (tmp & 0x7fff) | (1 << 6)); //use High freq clock 649 dib7000p_write_word(state, 900, (tmp & 0x7fff) | (1 << 6)); //use High freq clock
533} 650}
534 651
535static void dib7000p_restart_agc(struct dib7000p_state *state) 652static void dib7000p_restart_agc(struct dib7000p_state *state)
@@ -547,7 +664,7 @@ static int dib7000p_update_lna(struct dib7000p_state *state)
547 if (state->cfg.update_lna) { 664 if (state->cfg.update_lna) {
548 // read dyn_gain here (because it is demod-dependent and not fe) 665 // read dyn_gain here (because it is demod-dependent and not fe)
549 dyn_gain = dib7000p_read_word(state, 394); 666 dyn_gain = dib7000p_read_word(state, 394);
550 if (state->cfg.update_lna(&state->demod,dyn_gain)) { // LNA has changed 667 if (state->cfg.update_lna(&state->demod, dyn_gain)) { // LNA has changed
551 dib7000p_restart_agc(state); 668 dib7000p_restart_agc(state);
552 return 1; 669 return 1;
553 } 670 }
@@ -571,24 +688,24 @@ static int dib7000p_set_agc_config(struct dib7000p_state *state, u8 band)
571 } 688 }
572 689
573 if (agc == NULL) { 690 if (agc == NULL) {
574 dprintk( "no valid AGC configuration found for band 0x%02x",band); 691 dprintk("no valid AGC configuration found for band 0x%02x", band);
575 return -EINVAL; 692 return -EINVAL;
576 } 693 }
577 694
578 state->current_agc = agc; 695 state->current_agc = agc;
579 696
580 /* AGC */ 697 /* AGC */
581 dib7000p_write_word(state, 75 , agc->setup ); 698 dib7000p_write_word(state, 75, agc->setup);
582 dib7000p_write_word(state, 76 , agc->inv_gain ); 699 dib7000p_write_word(state, 76, agc->inv_gain);
583 dib7000p_write_word(state, 77 , agc->time_stabiliz ); 700 dib7000p_write_word(state, 77, agc->time_stabiliz);
584 dib7000p_write_word(state, 100, (agc->alpha_level << 12) | agc->thlock); 701 dib7000p_write_word(state, 100, (agc->alpha_level << 12) | agc->thlock);
585 702
586 // Demod AGC loop configuration 703 // Demod AGC loop configuration
587 dib7000p_write_word(state, 101, (agc->alpha_mant << 5) | agc->alpha_exp); 704 dib7000p_write_word(state, 101, (agc->alpha_mant << 5) | agc->alpha_exp);
588 dib7000p_write_word(state, 102, (agc->beta_mant << 6) | agc->beta_exp); 705 dib7000p_write_word(state, 102, (agc->beta_mant << 6) | agc->beta_exp);
589 706
590 /* AGC continued */ 707 /* AGC continued */
591 dprintk( "WBD: ref: %d, sel: %d, active: %d, alpha: %d", 708 dprintk("WBD: ref: %d, sel: %d, active: %d, alpha: %d",
592 state->wbd_ref != 0 ? state->wbd_ref : agc->wbd_ref, agc->wbd_sel, !agc->perform_agc_softsplit, agc->wbd_sel); 709 state->wbd_ref != 0 ? state->wbd_ref : agc->wbd_ref, agc->wbd_sel, !agc->perform_agc_softsplit, agc->wbd_sel);
593 710
594 if (state->wbd_ref != 0) 711 if (state->wbd_ref != 0)
@@ -598,101 +715,139 @@ static int dib7000p_set_agc_config(struct dib7000p_state *state, u8 band)
598 715
599 dib7000p_write_word(state, 106, (agc->wbd_sel << 13) | (agc->wbd_alpha << 9) | (agc->perform_agc_softsplit << 8)); 716 dib7000p_write_word(state, 106, (agc->wbd_sel << 13) | (agc->wbd_alpha << 9) | (agc->perform_agc_softsplit << 8));
600 717
601 dib7000p_write_word(state, 107, agc->agc1_max); 718 dib7000p_write_word(state, 107, agc->agc1_max);
602 dib7000p_write_word(state, 108, agc->agc1_min); 719 dib7000p_write_word(state, 108, agc->agc1_min);
603 dib7000p_write_word(state, 109, agc->agc2_max); 720 dib7000p_write_word(state, 109, agc->agc2_max);
604 dib7000p_write_word(state, 110, agc->agc2_min); 721 dib7000p_write_word(state, 110, agc->agc2_min);
605 dib7000p_write_word(state, 111, (agc->agc1_pt1 << 8) | agc->agc1_pt2); 722 dib7000p_write_word(state, 111, (agc->agc1_pt1 << 8) | agc->agc1_pt2);
606 dib7000p_write_word(state, 112, agc->agc1_pt3); 723 dib7000p_write_word(state, 112, agc->agc1_pt3);
607 dib7000p_write_word(state, 113, (agc->agc1_slope1 << 8) | agc->agc1_slope2); 724 dib7000p_write_word(state, 113, (agc->agc1_slope1 << 8) | agc->agc1_slope2);
608 dib7000p_write_word(state, 114, (agc->agc2_pt1 << 8) | agc->agc2_pt2); 725 dib7000p_write_word(state, 114, (agc->agc2_pt1 << 8) | agc->agc2_pt2);
609 dib7000p_write_word(state, 115, (agc->agc2_slope1 << 8) | agc->agc2_slope2); 726 dib7000p_write_word(state, 115, (agc->agc2_slope1 << 8) | agc->agc2_slope2);
610 return 0; 727 return 0;
611} 728}
612 729
730static void dib7000p_set_dds(struct dib7000p_state *state, s32 offset_khz)
731{
732 u32 internal = dib7000p_get_internal_freq(state);
733 s32 unit_khz_dds_val = 67108864 / (internal); /* 2**26 / Fsampling is the unit 1KHz offset */
734 u32 abs_offset_khz = ABS(offset_khz);
735 u32 dds = state->cfg.bw->ifreq & 0x1ffffff;
736 u8 invert = !!(state->cfg.bw->ifreq & (1 << 25));
737
738 dprintk("setting a frequency offset of %dkHz internal freq = %d invert = %d", offset_khz, internal, invert);
739
740 if (offset_khz < 0)
741 unit_khz_dds_val *= -1;
742
743 /* IF tuner */
744 if (invert)
745 dds -= (abs_offset_khz * unit_khz_dds_val); /* /100 because of /100 on the unit_khz_dds_val line calc for better accuracy */
746 else
747 dds += (abs_offset_khz * unit_khz_dds_val);
748
749 if (abs_offset_khz <= (internal / 2)) { /* Max dds offset is the half of the demod freq */
750 dib7000p_write_word(state, 21, (u16) (((dds >> 16) & 0x1ff) | (0 << 10) | (invert << 9)));
751 dib7000p_write_word(state, 22, (u16) (dds & 0xffff));
752 }
753}
754
613static int dib7000p_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch) 755static int dib7000p_agc_startup(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)
614{ 756{
615 struct dib7000p_state *state = demod->demodulator_priv; 757 struct dib7000p_state *state = demod->demodulator_priv;
616 int ret = -1; 758 int ret = -1;
617 u8 *agc_state = &state->agc_state; 759 u8 *agc_state = &state->agc_state;
618 u8 agc_split; 760 u8 agc_split;
761 u16 reg;
762 u32 upd_demod_gain_period = 0x1000;
619 763
620 switch (state->agc_state) { 764 switch (state->agc_state) {
621 case 0: 765 case 0:
622 // set power-up level: interf+analog+AGC 766 // set power-up level: interf+analog+AGC
623 dib7000p_set_power_mode(state, DIB7000P_POWER_ALL); 767 dib7000p_set_power_mode(state, DIB7000P_POWER_ALL);
768 if (state->version == SOC7090) {
769 reg = dib7000p_read_word(state, 0x79b) & 0xff00;
770 dib7000p_write_word(state, 0x79a, upd_demod_gain_period & 0xFFFF); /* lsb */
771 dib7000p_write_word(state, 0x79b, reg | (1 << 14) | ((upd_demod_gain_period >> 16) & 0xFF)); // bit 14 = enDemodGain
772
773 /* enable adc i & q */
774 reg = dib7000p_read_word(state, 0x780);
775 dib7000p_write_word(state, 0x780, (reg | (0x3)) & (~(1 << 7)));
776 } else {
624 dib7000p_set_adc_state(state, DIBX000_ADC_ON); 777 dib7000p_set_adc_state(state, DIBX000_ADC_ON);
625 dib7000p_pll_clk_cfg(state); 778 dib7000p_pll_clk_cfg(state);
779 }
626 780
627 if (dib7000p_set_agc_config(state, BAND_OF_FREQUENCY(ch->frequency/1000)) != 0) 781 if (dib7000p_set_agc_config(state, BAND_OF_FREQUENCY(ch->frequency / 1000)) != 0)
628 return -1; 782 return -1;
629
630 ret = 7;
631 (*agc_state)++;
632 break;
633 783
634 case 1: 784 dib7000p_set_dds(state, 0);
635 // AGC initialization 785 ret = 7;
636 if (state->cfg.agc_control) 786 (*agc_state)++;
637 state->cfg.agc_control(&state->demod, 1); 787 break;
638
639 dib7000p_write_word(state, 78, 32768);
640 if (!state->current_agc->perform_agc_softsplit) {
641 /* we are using the wbd - so slow AGC startup */
642 /* force 0 split on WBD and restart AGC */
643 dib7000p_write_word(state, 106, (state->current_agc->wbd_sel << 13) | (state->current_agc->wbd_alpha << 9) | (1 << 8));
644 (*agc_state)++;
645 ret = 5;
646 } else {
647 /* default AGC startup */
648 (*agc_state) = 4;
649 /* wait AGC rough lock time */
650 ret = 7;
651 }
652 788
653 dib7000p_restart_agc(state); 789 case 1:
654 break; 790 // AGC initialization
791 if (state->cfg.agc_control)
792 state->cfg.agc_control(&state->demod, 1);
655 793
656 case 2: /* fast split search path after 5sec */ 794 dib7000p_write_word(state, 78, 32768);
657 dib7000p_write_word(state, 75, state->current_agc->setup | (1 << 4)); /* freeze AGC loop */ 795 if (!state->current_agc->perform_agc_softsplit) {
658 dib7000p_write_word(state, 106, (state->current_agc->wbd_sel << 13) | (2 << 9) | (0 << 8)); /* fast split search 0.25kHz */ 796 /* we are using the wbd - so slow AGC startup */
797 /* force 0 split on WBD and restart AGC */
798 dib7000p_write_word(state, 106, (state->current_agc->wbd_sel << 13) | (state->current_agc->wbd_alpha << 9) | (1 << 8));
659 (*agc_state)++; 799 (*agc_state)++;
660 ret = 14; 800 ret = 5;
661 break; 801 } else {
802 /* default AGC startup */
803 (*agc_state) = 4;
804 /* wait AGC rough lock time */
805 ret = 7;
806 }
662 807
663 case 3: /* split search ended */ 808 dib7000p_restart_agc(state);
664 agc_split = (u8)dib7000p_read_word(state, 396); /* store the split value for the next time */ 809 break;
665 dib7000p_write_word(state, 78, dib7000p_read_word(state, 394)); /* set AGC gain start value */
666 810
667 dib7000p_write_word(state, 75, state->current_agc->setup); /* std AGC loop */ 811 case 2: /* fast split search path after 5sec */
668 dib7000p_write_word(state, 106, (state->current_agc->wbd_sel << 13) | (state->current_agc->wbd_alpha << 9) | agc_split); /* standard split search */ 812 dib7000p_write_word(state, 75, state->current_agc->setup | (1 << 4)); /* freeze AGC loop */
813 dib7000p_write_word(state, 106, (state->current_agc->wbd_sel << 13) | (2 << 9) | (0 << 8)); /* fast split search 0.25kHz */
814 (*agc_state)++;
815 ret = 14;
816 break;
669 817
670 dib7000p_restart_agc(state); 818 case 3: /* split search ended */
819 agc_split = (u8) dib7000p_read_word(state, 396); /* store the split value for the next time */
820 dib7000p_write_word(state, 78, dib7000p_read_word(state, 394)); /* set AGC gain start value */
671 821
672 dprintk( "SPLIT %p: %hd", demod, agc_split); 822 dib7000p_write_word(state, 75, state->current_agc->setup); /* std AGC loop */
823 dib7000p_write_word(state, 106, (state->current_agc->wbd_sel << 13) | (state->current_agc->wbd_alpha << 9) | agc_split); /* standard split search */
673 824
674 (*agc_state)++; 825 dib7000p_restart_agc(state);
675 ret = 5;
676 break;
677 826
678 case 4: /* LNA startup */ 827 dprintk("SPLIT %p: %hd", demod, agc_split);
679 // wait AGC accurate lock time
680 ret = 7;
681 828
682 if (dib7000p_update_lna(state)) 829 (*agc_state)++;
683 // wait only AGC rough lock time 830 ret = 5;
684 ret = 5; 831 break;
685 else // nothing was done, go to the next state
686 (*agc_state)++;
687 break;
688 832
689 case 5: 833 case 4: /* LNA startup */
690 if (state->cfg.agc_control) 834 // wait AGC accurate lock time
691 state->cfg.agc_control(&state->demod, 0); 835 ret = 7;
836
837 if (dib7000p_update_lna(state))
838 // wait only AGC rough lock time
839 ret = 5;
840 else // nothing was done, go to the next state
692 (*agc_state)++; 841 (*agc_state)++;
693 break; 842 break;
694 default: 843
695 break; 844 case 5:
845 if (state->cfg.agc_control)
846 state->cfg.agc_control(&state->demod, 0);
847 (*agc_state)++;
848 break;
849 default:
850 break;
696 } 851 }
697 return ret; 852 return ret;
698} 853}
@@ -703,45 +858,89 @@ static void dib7000p_update_timf(struct dib7000p_state *state)
703 state->timf = timf * 160 / (state->current_bandwidth / 50); 858 state->timf = timf * 160 / (state->current_bandwidth / 50);
704 dib7000p_write_word(state, 23, (u16) (timf >> 16)); 859 dib7000p_write_word(state, 23, (u16) (timf >> 16));
705 dib7000p_write_word(state, 24, (u16) (timf & 0xffff)); 860 dib7000p_write_word(state, 24, (u16) (timf & 0xffff));
706 dprintk( "updated timf_frequency: %d (default: %d)",state->timf, state->cfg.bw->timf); 861 dprintk("updated timf_frequency: %d (default: %d)", state->timf, state->cfg.bw->timf);
862
863}
707 864
865u32 dib7000p_ctrl_timf(struct dvb_frontend *fe, u8 op, u32 timf)
866{
867 struct dib7000p_state *state = fe->demodulator_priv;
868 switch (op) {
869 case DEMOD_TIMF_SET:
870 state->timf = timf;
871 break;
872 case DEMOD_TIMF_UPDATE:
873 dib7000p_update_timf(state);
874 break;
875 case DEMOD_TIMF_GET:
876 break;
877 }
878 dib7000p_set_bandwidth(state, state->current_bandwidth);
879 return state->timf;
708} 880}
881EXPORT_SYMBOL(dib7000p_ctrl_timf);
709 882
710static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_frontend_parameters *ch, u8 seq) 883static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_frontend_parameters *ch, u8 seq)
711{ 884{
712 u16 value, est[4]; 885 u16 value, est[4];
713 886
714 dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth)); 887 dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth));
715 888
716 /* nfft, guard, qam, alpha */ 889 /* nfft, guard, qam, alpha */
717 value = 0; 890 value = 0;
718 switch (ch->u.ofdm.transmission_mode) { 891 switch (ch->u.ofdm.transmission_mode) {
719 case TRANSMISSION_MODE_2K: value |= (0 << 7); break; 892 case TRANSMISSION_MODE_2K:
720 case TRANSMISSION_MODE_4K: value |= (2 << 7); break; 893 value |= (0 << 7);
721 default: 894 break;
722 case TRANSMISSION_MODE_8K: value |= (1 << 7); break; 895 case TRANSMISSION_MODE_4K:
896 value |= (2 << 7);
897 break;
898 default:
899 case TRANSMISSION_MODE_8K:
900 value |= (1 << 7);
901 break;
723 } 902 }
724 switch (ch->u.ofdm.guard_interval) { 903 switch (ch->u.ofdm.guard_interval) {
725 case GUARD_INTERVAL_1_32: value |= (0 << 5); break; 904 case GUARD_INTERVAL_1_32:
726 case GUARD_INTERVAL_1_16: value |= (1 << 5); break; 905 value |= (0 << 5);
727 case GUARD_INTERVAL_1_4: value |= (3 << 5); break; 906 break;
728 default: 907 case GUARD_INTERVAL_1_16:
729 case GUARD_INTERVAL_1_8: value |= (2 << 5); break; 908 value |= (1 << 5);
909 break;
910 case GUARD_INTERVAL_1_4:
911 value |= (3 << 5);
912 break;
913 default:
914 case GUARD_INTERVAL_1_8:
915 value |= (2 << 5);
916 break;
730 } 917 }
731 switch (ch->u.ofdm.constellation) { 918 switch (ch->u.ofdm.constellation) {
732 case QPSK: value |= (0 << 3); break; 919 case QPSK:
733 case QAM_16: value |= (1 << 3); break; 920 value |= (0 << 3);
734 default: 921 break;
735 case QAM_64: value |= (2 << 3); break; 922 case QAM_16:
923 value |= (1 << 3);
924 break;
925 default:
926 case QAM_64:
927 value |= (2 << 3);
928 break;
736 } 929 }
737 switch (HIERARCHY_1) { 930 switch (HIERARCHY_1) {
738 case HIERARCHY_2: value |= 2; break; 931 case HIERARCHY_2:
739 case HIERARCHY_4: value |= 4; break; 932 value |= 2;
740 default: 933 break;
741 case HIERARCHY_1: value |= 1; break; 934 case HIERARCHY_4:
935 value |= 4;
936 break;
937 default:
938 case HIERARCHY_1:
939 value |= 1;
940 break;
742 } 941 }
743 dib7000p_write_word(state, 0, value); 942 dib7000p_write_word(state, 0, value);
744 dib7000p_write_word(state, 5, (seq << 4) | 1); /* do not force tps, search list 0 */ 943 dib7000p_write_word(state, 5, (seq << 4) | 1); /* do not force tps, search list 0 */
745 944
746 /* P_dintl_native, P_dintlv_inv, P_hrch, P_code_rate, P_select_hp */ 945 /* P_dintl_native, P_dintlv_inv, P_hrch, P_code_rate, P_select_hp */
747 value = 0; 946 value = 0;
@@ -752,39 +951,63 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
752 if (1 == 1) 951 if (1 == 1)
753 value |= 1; 952 value |= 1;
754 switch ((ch->u.ofdm.hierarchy_information == 0 || 1 == 1) ? ch->u.ofdm.code_rate_HP : ch->u.ofdm.code_rate_LP) { 953 switch ((ch->u.ofdm.hierarchy_information == 0 || 1 == 1) ? ch->u.ofdm.code_rate_HP : ch->u.ofdm.code_rate_LP) {
755 case FEC_2_3: value |= (2 << 1); break; 954 case FEC_2_3:
756 case FEC_3_4: value |= (3 << 1); break; 955 value |= (2 << 1);
757 case FEC_5_6: value |= (5 << 1); break; 956 break;
758 case FEC_7_8: value |= (7 << 1); break; 957 case FEC_3_4:
759 default: 958 value |= (3 << 1);
760 case FEC_1_2: value |= (1 << 1); break; 959 break;
960 case FEC_5_6:
961 value |= (5 << 1);
962 break;
963 case FEC_7_8:
964 value |= (7 << 1);
965 break;
966 default:
967 case FEC_1_2:
968 value |= (1 << 1);
969 break;
761 } 970 }
762 dib7000p_write_word(state, 208, value); 971 dib7000p_write_word(state, 208, value);
763 972
764 /* offset loop parameters */ 973 /* offset loop parameters */
765 dib7000p_write_word(state, 26, 0x6680); // timf(6xxx) 974 dib7000p_write_word(state, 26, 0x6680); // timf(6xxx)
766 dib7000p_write_word(state, 32, 0x0003); // pha_off_max(xxx3) 975 dib7000p_write_word(state, 32, 0x0003); // pha_off_max(xxx3)
767 dib7000p_write_word(state, 29, 0x1273); // isi 976 dib7000p_write_word(state, 29, 0x1273); // isi
768 dib7000p_write_word(state, 33, 0x0005); // sfreq(xxx5) 977 dib7000p_write_word(state, 33, 0x0005); // sfreq(xxx5)
769 978
770 /* P_dvsy_sync_wait */ 979 /* P_dvsy_sync_wait */
771 switch (ch->u.ofdm.transmission_mode) { 980 switch (ch->u.ofdm.transmission_mode) {
772 case TRANSMISSION_MODE_8K: value = 256; break; 981 case TRANSMISSION_MODE_8K:
773 case TRANSMISSION_MODE_4K: value = 128; break; 982 value = 256;
774 case TRANSMISSION_MODE_2K: 983 break;
775 default: value = 64; break; 984 case TRANSMISSION_MODE_4K:
985 value = 128;
986 break;
987 case TRANSMISSION_MODE_2K:
988 default:
989 value = 64;
990 break;
776 } 991 }
777 switch (ch->u.ofdm.guard_interval) { 992 switch (ch->u.ofdm.guard_interval) {
778 case GUARD_INTERVAL_1_16: value *= 2; break; 993 case GUARD_INTERVAL_1_16:
779 case GUARD_INTERVAL_1_8: value *= 4; break; 994 value *= 2;
780 case GUARD_INTERVAL_1_4: value *= 8; break; 995 break;
781 default: 996 case GUARD_INTERVAL_1_8:
782 case GUARD_INTERVAL_1_32: value *= 1; break; 997 value *= 4;
998 break;
999 case GUARD_INTERVAL_1_4:
1000 value *= 8;
1001 break;
1002 default:
1003 case GUARD_INTERVAL_1_32:
1004 value *= 1;
1005 break;
783 } 1006 }
784 if (state->cfg.diversity_delay == 0) 1007 if (state->cfg.diversity_delay == 0)
785 state->div_sync_wait = (value * 3) / 2 + 48; // add 50% SFN margin + compensate for one DVSY-fifo 1008 state->div_sync_wait = (value * 3) / 2 + 48; // add 50% SFN margin + compensate for one DVSY-fifo
786 else 1009 else
787 state->div_sync_wait = (value * 3) / 2 + state->cfg.diversity_delay; // add 50% SFN margin + compensate for one DVSY-fifo 1010 state->div_sync_wait = (value * 3) / 2 + state->cfg.diversity_delay; // add 50% SFN margin + compensate for one DVSY-fifo
788 1011
789 /* deactive the possibility of diversity reception if extended interleaver */ 1012 /* deactive the possibility of diversity reception if extended interleaver */
790 state->div_force_off = !1 && ch->u.ofdm.transmission_mode != TRANSMISSION_MODE_8K; 1013 state->div_force_off = !1 && ch->u.ofdm.transmission_mode != TRANSMISSION_MODE_8K;
@@ -792,24 +1015,24 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
792 1015
793 /* channel estimation fine configuration */ 1016 /* channel estimation fine configuration */
794 switch (ch->u.ofdm.constellation) { 1017 switch (ch->u.ofdm.constellation) {
795 case QAM_64: 1018 case QAM_64:
796 est[0] = 0x0148; /* P_adp_regul_cnt 0.04 */ 1019 est[0] = 0x0148; /* P_adp_regul_cnt 0.04 */
797 est[1] = 0xfff0; /* P_adp_noise_cnt -0.002 */ 1020 est[1] = 0xfff0; /* P_adp_noise_cnt -0.002 */
798 est[2] = 0x00a4; /* P_adp_regul_ext 0.02 */ 1021 est[2] = 0x00a4; /* P_adp_regul_ext 0.02 */
799 est[3] = 0xfff8; /* P_adp_noise_ext -0.001 */ 1022 est[3] = 0xfff8; /* P_adp_noise_ext -0.001 */
800 break; 1023 break;
801 case QAM_16: 1024 case QAM_16:
802 est[0] = 0x023d; /* P_adp_regul_cnt 0.07 */ 1025 est[0] = 0x023d; /* P_adp_regul_cnt 0.07 */
803 est[1] = 0xffdf; /* P_adp_noise_cnt -0.004 */ 1026 est[1] = 0xffdf; /* P_adp_noise_cnt -0.004 */
804 est[2] = 0x00a4; /* P_adp_regul_ext 0.02 */ 1027 est[2] = 0x00a4; /* P_adp_regul_ext 0.02 */
805 est[3] = 0xfff0; /* P_adp_noise_ext -0.002 */ 1028 est[3] = 0xfff0; /* P_adp_noise_ext -0.002 */
806 break; 1029 break;
807 default: 1030 default:
808 est[0] = 0x099a; /* P_adp_regul_cnt 0.3 */ 1031 est[0] = 0x099a; /* P_adp_regul_cnt 0.3 */
809 est[1] = 0xffae; /* P_adp_noise_cnt -0.01 */ 1032 est[1] = 0xffae; /* P_adp_noise_cnt -0.01 */
810 est[2] = 0x0333; /* P_adp_regul_ext 0.1 */ 1033 est[2] = 0x0333; /* P_adp_regul_ext 0.1 */
811 est[3] = 0xfff8; /* P_adp_noise_ext -0.002 */ 1034 est[3] = 0xfff8; /* P_adp_noise_ext -0.002 */
812 break; 1035 break;
813 } 1036 }
814 for (value = 0; value < 4; value++) 1037 for (value = 0; value < 4; value++)
815 dib7000p_write_word(state, 187 + value, est[value]); 1038 dib7000p_write_word(state, 187 + value, est[value]);
@@ -820,14 +1043,15 @@ static int dib7000p_autosearch_start(struct dvb_frontend *demod, struct dvb_fron
820 struct dib7000p_state *state = demod->demodulator_priv; 1043 struct dib7000p_state *state = demod->demodulator_priv;
821 struct dvb_frontend_parameters schan; 1044 struct dvb_frontend_parameters schan;
822 u32 value, factor; 1045 u32 value, factor;
1046 u32 internal = dib7000p_get_internal_freq(state);
823 1047
824 schan = *ch; 1048 schan = *ch;
825 schan.u.ofdm.constellation = QAM_64; 1049 schan.u.ofdm.constellation = QAM_64;
826 schan.u.ofdm.guard_interval = GUARD_INTERVAL_1_32; 1050 schan.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
827 schan.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K; 1051 schan.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
828 schan.u.ofdm.code_rate_HP = FEC_2_3; 1052 schan.u.ofdm.code_rate_HP = FEC_2_3;
829 schan.u.ofdm.code_rate_LP = FEC_3_4; 1053 schan.u.ofdm.code_rate_LP = FEC_3_4;
830 schan.u.ofdm.hierarchy_information = 0; 1054 schan.u.ofdm.hierarchy_information = 0;
831 1055
832 dib7000p_set_channel(state, &schan, 7); 1056 dib7000p_set_channel(state, &schan, 7);
833 1057
@@ -838,15 +1062,15 @@ static int dib7000p_autosearch_start(struct dvb_frontend *demod, struct dvb_fron
838 factor = 6; 1062 factor = 6;
839 1063
840 // always use the setting for 8MHz here lock_time for 7,6 MHz are longer 1064 // always use the setting for 8MHz here lock_time for 7,6 MHz are longer
841 value = 30 * state->cfg.bw->internal * factor; 1065 value = 30 * internal * factor;
842 dib7000p_write_word(state, 6, (u16) ((value >> 16) & 0xffff)); // lock0 wait time 1066 dib7000p_write_word(state, 6, (u16) ((value >> 16) & 0xffff)); // lock0 wait time
843 dib7000p_write_word(state, 7, (u16) (value & 0xffff)); // lock0 wait time 1067 dib7000p_write_word(state, 7, (u16) (value & 0xffff)); // lock0 wait time
844 value = 100 * state->cfg.bw->internal * factor; 1068 value = 100 * internal * factor;
845 dib7000p_write_word(state, 8, (u16) ((value >> 16) & 0xffff)); // lock1 wait time 1069 dib7000p_write_word(state, 8, (u16) ((value >> 16) & 0xffff)); // lock1 wait time
846 dib7000p_write_word(state, 9, (u16) (value & 0xffff)); // lock1 wait time 1070 dib7000p_write_word(state, 9, (u16) (value & 0xffff)); // lock1 wait time
847 value = 500 * state->cfg.bw->internal * factor; 1071 value = 500 * internal * factor;
848 dib7000p_write_word(state, 10, (u16) ((value >> 16) & 0xffff)); // lock2 wait time 1072 dib7000p_write_word(state, 10, (u16) ((value >> 16) & 0xffff)); // lock2 wait time
849 dib7000p_write_word(state, 11, (u16) (value & 0xffff)); // lock2 wait time 1073 dib7000p_write_word(state, 11, (u16) (value & 0xffff)); // lock2 wait time
850 1074
851 value = dib7000p_read_word(state, 0); 1075 value = dib7000p_read_word(state, 0);
852 dib7000p_write_word(state, 0, (u16) ((1 << 9) | value)); 1076 dib7000p_write_word(state, 0, (u16) ((1 << 9) | value));
@@ -861,101 +1085,101 @@ static int dib7000p_autosearch_is_irq(struct dvb_frontend *demod)
861 struct dib7000p_state *state = demod->demodulator_priv; 1085 struct dib7000p_state *state = demod->demodulator_priv;
862 u16 irq_pending = dib7000p_read_word(state, 1284); 1086 u16 irq_pending = dib7000p_read_word(state, 1284);
863 1087
864 if (irq_pending & 0x1) // failed 1088 if (irq_pending & 0x1) // failed
865 return 1; 1089 return 1;
866 1090
867 if (irq_pending & 0x2) // succeeded 1091 if (irq_pending & 0x2) // succeeded
868 return 2; 1092 return 2;
869 1093
870 return 0; // still pending 1094 return 0; // still pending
871} 1095}
872 1096
873static void dib7000p_spur_protect(struct dib7000p_state *state, u32 rf_khz, u32 bw) 1097static void dib7000p_spur_protect(struct dib7000p_state *state, u32 rf_khz, u32 bw)
874{ 1098{
875 static s16 notch[]={16143, 14402, 12238, 9713, 6902, 3888, 759, -2392}; 1099 static s16 notch[] = { 16143, 14402, 12238, 9713, 6902, 3888, 759, -2392 };
876 static u8 sine [] ={0, 2, 3, 5, 6, 8, 9, 11, 13, 14, 16, 17, 19, 20, 22, 1100 static u8 sine[] = { 0, 2, 3, 5, 6, 8, 9, 11, 13, 14, 16, 17, 19, 20, 22,
877 24, 25, 27, 28, 30, 31, 33, 34, 36, 38, 39, 41, 42, 44, 45, 47, 48, 50, 51, 1101 24, 25, 27, 28, 30, 31, 33, 34, 36, 38, 39, 41, 42, 44, 45, 47, 48, 50, 51,
878 53, 55, 56, 58, 59, 61, 62, 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 79, 80, 1102 53, 55, 56, 58, 59, 61, 62, 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 79, 80,
879 82, 83, 85, 86, 88, 89, 91, 92, 94, 95, 97, 98, 99, 101, 102, 104, 105, 1103 82, 83, 85, 86, 88, 89, 91, 92, 94, 95, 97, 98, 99, 101, 102, 104, 105,
880 107, 108, 109, 111, 112, 114, 115, 117, 118, 119, 121, 122, 123, 125, 126, 1104 107, 108, 109, 111, 112, 114, 115, 117, 118, 119, 121, 122, 123, 125, 126,
881 128, 129, 130, 132, 133, 134, 136, 137, 138, 140, 141, 142, 144, 145, 146, 1105 128, 129, 130, 132, 133, 134, 136, 137, 138, 140, 141, 142, 144, 145, 146,
882 147, 149, 150, 151, 152, 154, 155, 156, 157, 159, 160, 161, 162, 164, 165, 1106 147, 149, 150, 151, 152, 154, 155, 156, 157, 159, 160, 161, 162, 164, 165,
883 166, 167, 168, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180, 181, 182, 1107 166, 167, 168, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180, 181, 182,
884 183, 184, 185, 186, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 1108 183, 184, 185, 186, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
885 199, 200, 201, 202, 203, 204, 205, 206, 207, 207, 208, 209, 210, 211, 212, 1109 199, 200, 201, 202, 203, 204, 205, 206, 207, 207, 208, 209, 210, 211, 212,
886 213, 214, 215, 215, 216, 217, 218, 219, 220, 220, 221, 222, 223, 224, 224, 1110 213, 214, 215, 215, 216, 217, 218, 219, 220, 220, 221, 222, 223, 224, 224,
887 225, 226, 227, 227, 228, 229, 229, 230, 231, 231, 232, 233, 233, 234, 235, 1111 225, 226, 227, 227, 228, 229, 229, 230, 231, 231, 232, 233, 233, 234, 235,
888 235, 236, 237, 237, 238, 238, 239, 239, 240, 241, 241, 242, 242, 243, 243, 1112 235, 236, 237, 237, 238, 238, 239, 239, 240, 241, 241, 242, 242, 243, 243,
889 244, 244, 245, 245, 245, 246, 246, 247, 247, 248, 248, 248, 249, 249, 249, 1113 244, 244, 245, 245, 245, 246, 246, 247, 247, 248, 248, 248, 249, 249, 249,
890 250, 250, 250, 251, 251, 251, 252, 252, 252, 252, 253, 253, 253, 253, 254, 1114 250, 250, 250, 251, 251, 251, 252, 252, 252, 252, 253, 253, 253, 253, 254,
891 254, 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 1115 254, 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
892 255, 255, 255, 255, 255, 255}; 1116 255, 255, 255, 255, 255, 255
1117 };
893 1118
894 u32 xtal = state->cfg.bw->xtal_hz / 1000; 1119 u32 xtal = state->cfg.bw->xtal_hz / 1000;
895 int f_rel = DIV_ROUND_CLOSEST(rf_khz, xtal) * xtal - rf_khz; 1120 int f_rel = DIV_ROUND_CLOSEST(rf_khz, xtal) * xtal - rf_khz;
896 int k; 1121 int k;
897 int coef_re[8],coef_im[8]; 1122 int coef_re[8], coef_im[8];
898 int bw_khz = bw; 1123 int bw_khz = bw;
899 u32 pha; 1124 u32 pha;
900 1125
901 dprintk( "relative position of the Spur: %dk (RF: %dk, XTAL: %dk)", f_rel, rf_khz, xtal); 1126 dprintk("relative position of the Spur: %dk (RF: %dk, XTAL: %dk)", f_rel, rf_khz, xtal);
902 1127
903 1128 if (f_rel < -bw_khz / 2 || f_rel > bw_khz / 2)
904 if (f_rel < -bw_khz/2 || f_rel > bw_khz/2)
905 return; 1129 return;
906 1130
907 bw_khz /= 100; 1131 bw_khz /= 100;
908 1132
909 dib7000p_write_word(state, 142 ,0x0610); 1133 dib7000p_write_word(state, 142, 0x0610);
910 1134
911 for (k = 0; k < 8; k++) { 1135 for (k = 0; k < 8; k++) {
912 pha = ((f_rel * (k+1) * 112 * 80/bw_khz) /1000) & 0x3ff; 1136 pha = ((f_rel * (k + 1) * 112 * 80 / bw_khz) / 1000) & 0x3ff;
913 1137
914 if (pha==0) { 1138 if (pha == 0) {
915 coef_re[k] = 256; 1139 coef_re[k] = 256;
916 coef_im[k] = 0; 1140 coef_im[k] = 0;
917 } else if(pha < 256) { 1141 } else if (pha < 256) {
918 coef_re[k] = sine[256-(pha&0xff)]; 1142 coef_re[k] = sine[256 - (pha & 0xff)];
919 coef_im[k] = sine[pha&0xff]; 1143 coef_im[k] = sine[pha & 0xff];
920 } else if (pha == 256) { 1144 } else if (pha == 256) {
921 coef_re[k] = 0; 1145 coef_re[k] = 0;
922 coef_im[k] = 256; 1146 coef_im[k] = 256;
923 } else if (pha < 512) { 1147 } else if (pha < 512) {
924 coef_re[k] = -sine[pha&0xff]; 1148 coef_re[k] = -sine[pha & 0xff];
925 coef_im[k] = sine[256 - (pha&0xff)]; 1149 coef_im[k] = sine[256 - (pha & 0xff)];
926 } else if (pha == 512) { 1150 } else if (pha == 512) {
927 coef_re[k] = -256; 1151 coef_re[k] = -256;
928 coef_im[k] = 0; 1152 coef_im[k] = 0;
929 } else if (pha < 768) { 1153 } else if (pha < 768) {
930 coef_re[k] = -sine[256-(pha&0xff)]; 1154 coef_re[k] = -sine[256 - (pha & 0xff)];
931 coef_im[k] = -sine[pha&0xff]; 1155 coef_im[k] = -sine[pha & 0xff];
932 } else if (pha == 768) { 1156 } else if (pha == 768) {
933 coef_re[k] = 0; 1157 coef_re[k] = 0;
934 coef_im[k] = -256; 1158 coef_im[k] = -256;
935 } else { 1159 } else {
936 coef_re[k] = sine[pha&0xff]; 1160 coef_re[k] = sine[pha & 0xff];
937 coef_im[k] = -sine[256 - (pha&0xff)]; 1161 coef_im[k] = -sine[256 - (pha & 0xff)];
938 } 1162 }
939 1163
940 coef_re[k] *= notch[k]; 1164 coef_re[k] *= notch[k];
941 coef_re[k] += (1<<14); 1165 coef_re[k] += (1 << 14);
942 if (coef_re[k] >= (1<<24)) 1166 if (coef_re[k] >= (1 << 24))
943 coef_re[k] = (1<<24) - 1; 1167 coef_re[k] = (1 << 24) - 1;
944 coef_re[k] /= (1<<15); 1168 coef_re[k] /= (1 << 15);
945 1169
946 coef_im[k] *= notch[k]; 1170 coef_im[k] *= notch[k];
947 coef_im[k] += (1<<14); 1171 coef_im[k] += (1 << 14);
948 if (coef_im[k] >= (1<<24)) 1172 if (coef_im[k] >= (1 << 24))
949 coef_im[k] = (1<<24)-1; 1173 coef_im[k] = (1 << 24) - 1;
950 coef_im[k] /= (1<<15); 1174 coef_im[k] /= (1 << 15);
951 1175
952 dprintk( "PALF COEF: %d re: %d im: %d", k, coef_re[k], coef_im[k]); 1176 dprintk("PALF COEF: %d re: %d im: %d", k, coef_re[k], coef_im[k]);
953 1177
954 dib7000p_write_word(state, 143, (0 << 14) | (k << 10) | (coef_re[k] & 0x3ff)); 1178 dib7000p_write_word(state, 143, (0 << 14) | (k << 10) | (coef_re[k] & 0x3ff));
955 dib7000p_write_word(state, 144, coef_im[k] & 0x3ff); 1179 dib7000p_write_word(state, 144, coef_im[k] & 0x3ff);
956 dib7000p_write_word(state, 143, (1 << 14) | (k << 10) | (coef_re[k] & 0x3ff)); 1180 dib7000p_write_word(state, 143, (1 << 14) | (k << 10) | (coef_re[k] & 0x3ff));
957 } 1181 }
958 dib7000p_write_word(state,143 ,0); 1182 dib7000p_write_word(state, 143, 0);
959} 1183}
960 1184
961static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch) 1185static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_parameters *ch)
@@ -976,11 +1200,11 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
976 /* 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 */ 1200 /* 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 */
977 tmp = (0 << 14) | (4 << 10) | (0 << 9) | (3 << 5) | (1 << 4) | (0x3); 1201 tmp = (0 << 14) | (4 << 10) | (0 << 9) | (3 << 5) | (1 << 4) | (0x3);
978 if (state->sfn_workaround_active) { 1202 if (state->sfn_workaround_active) {
979 dprintk( "SFN workaround is active"); 1203 dprintk("SFN workaround is active");
980 tmp |= (1 << 9); 1204 tmp |= (1 << 9);
981 dib7000p_write_word(state, 166, 0x4000); // P_pha3_force_pha_shift 1205 dib7000p_write_word(state, 166, 0x4000); // P_pha3_force_pha_shift
982 } else { 1206 } else {
983 dib7000p_write_word(state, 166, 0x0000); // P_pha3_force_pha_shift 1207 dib7000p_write_word(state, 166, 0x0000); // P_pha3_force_pha_shift
984 } 1208 }
985 dib7000p_write_word(state, 29, tmp); 1209 dib7000p_write_word(state, 29, tmp);
986 1210
@@ -993,51 +1217,72 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
993 /* P_timf_alpha, P_corm_alpha=6, P_corm_thres=0x80 */ 1217 /* P_timf_alpha, P_corm_alpha=6, P_corm_thres=0x80 */
994 tmp = (6 << 8) | 0x80; 1218 tmp = (6 << 8) | 0x80;
995 switch (ch->u.ofdm.transmission_mode) { 1219 switch (ch->u.ofdm.transmission_mode) {
996 case TRANSMISSION_MODE_2K: tmp |= (7 << 12); break; 1220 case TRANSMISSION_MODE_2K:
997 case TRANSMISSION_MODE_4K: tmp |= (8 << 12); break; 1221 tmp |= (2 << 12);
998 default: 1222 break;
999 case TRANSMISSION_MODE_8K: tmp |= (9 << 12); break; 1223 case TRANSMISSION_MODE_4K:
1224 tmp |= (3 << 12);
1225 break;
1226 default:
1227 case TRANSMISSION_MODE_8K:
1228 tmp |= (4 << 12);
1229 break;
1000 } 1230 }
1001 dib7000p_write_word(state, 26, tmp); /* timf_a(6xxx) */ 1231 dib7000p_write_word(state, 26, tmp); /* timf_a(6xxx) */
1002 1232
1003 /* P_ctrl_freeze_pha_shift=0, P_ctrl_pha_off_max */ 1233 /* P_ctrl_freeze_pha_shift=0, P_ctrl_pha_off_max */
1004 tmp = (0 << 4); 1234 tmp = (0 << 4);
1005 switch (ch->u.ofdm.transmission_mode) { 1235 switch (ch->u.ofdm.transmission_mode) {
1006 case TRANSMISSION_MODE_2K: tmp |= 0x6; break; 1236 case TRANSMISSION_MODE_2K:
1007 case TRANSMISSION_MODE_4K: tmp |= 0x7; break; 1237 tmp |= 0x6;
1008 default: 1238 break;
1009 case TRANSMISSION_MODE_8K: tmp |= 0x8; break; 1239 case TRANSMISSION_MODE_4K:
1240 tmp |= 0x7;
1241 break;
1242 default:
1243 case TRANSMISSION_MODE_8K:
1244 tmp |= 0x8;
1245 break;
1010 } 1246 }
1011 dib7000p_write_word(state, 32, tmp); 1247 dib7000p_write_word(state, 32, tmp);
1012 1248
1013 /* P_ctrl_sfreq_inh=0, P_ctrl_sfreq_step */ 1249 /* P_ctrl_sfreq_inh=0, P_ctrl_sfreq_step */
1014 tmp = (0 << 4); 1250 tmp = (0 << 4);
1015 switch (ch->u.ofdm.transmission_mode) { 1251 switch (ch->u.ofdm.transmission_mode) {
1016 case TRANSMISSION_MODE_2K: tmp |= 0x6; break; 1252 case TRANSMISSION_MODE_2K:
1017 case TRANSMISSION_MODE_4K: tmp |= 0x7; break; 1253 tmp |= 0x6;
1018 default: 1254 break;
1019 case TRANSMISSION_MODE_8K: tmp |= 0x8; break; 1255 case TRANSMISSION_MODE_4K:
1256 tmp |= 0x7;
1257 break;
1258 default:
1259 case TRANSMISSION_MODE_8K:
1260 tmp |= 0x8;
1261 break;
1020 } 1262 }
1021 dib7000p_write_word(state, 33, tmp); 1263 dib7000p_write_word(state, 33, tmp);
1022 1264
1023 tmp = dib7000p_read_word(state,509); 1265 tmp = dib7000p_read_word(state, 509);
1024 if (!((tmp >> 6) & 0x1)) { 1266 if (!((tmp >> 6) & 0x1)) {
1025 /* restart the fec */ 1267 /* restart the fec */
1026 tmp = dib7000p_read_word(state,771); 1268 tmp = dib7000p_read_word(state, 771);
1027 dib7000p_write_word(state, 771, tmp | (1 << 1)); 1269 dib7000p_write_word(state, 771, tmp | (1 << 1));
1028 dib7000p_write_word(state, 771, tmp); 1270 dib7000p_write_word(state, 771, tmp);
1029 msleep(10); 1271 msleep(40);
1030 tmp = dib7000p_read_word(state,509); 1272 tmp = dib7000p_read_word(state, 509);
1031 } 1273 }
1032
1033 // we achieved a lock - it's time to update the osc freq 1274 // we achieved a lock - it's time to update the osc freq
1034 if ((tmp >> 6) & 0x1) 1275 if ((tmp >> 6) & 0x1) {
1035 dib7000p_update_timf(state); 1276 dib7000p_update_timf(state);
1277 /* P_timf_alpha += 2 */
1278 tmp = dib7000p_read_word(state, 26);
1279 dib7000p_write_word(state, 26, (tmp & ~(0xf << 12)) | ((((tmp >> 12) & 0xf) + 5) << 12));
1280 }
1036 1281
1037 if (state->cfg.spur_protect) 1282 if (state->cfg.spur_protect)
1038 dib7000p_spur_protect(state, ch->frequency/1000, BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth)); 1283 dib7000p_spur_protect(state, ch->frequency / 1000, BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth));
1039 1284
1040 dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth)); 1285 dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(ch->u.ofdm.bandwidth));
1041 return 0; 1286 return 0;
1042} 1287}
1043 1288
@@ -1046,63 +1291,82 @@ static int dib7000p_wakeup(struct dvb_frontend *demod)
1046 struct dib7000p_state *state = demod->demodulator_priv; 1291 struct dib7000p_state *state = demod->demodulator_priv;
1047 dib7000p_set_power_mode(state, DIB7000P_POWER_ALL); 1292 dib7000p_set_power_mode(state, DIB7000P_POWER_ALL);
1048 dib7000p_set_adc_state(state, DIBX000_SLOW_ADC_ON); 1293 dib7000p_set_adc_state(state, DIBX000_SLOW_ADC_ON);
1294 if (state->version == SOC7090)
1295 dib7000p_sad_calib(state);
1049 return 0; 1296 return 0;
1050} 1297}
1051 1298
1052static int dib7000p_sleep(struct dvb_frontend *demod) 1299static int dib7000p_sleep(struct dvb_frontend *demod)
1053{ 1300{
1054 struct dib7000p_state *state = demod->demodulator_priv; 1301 struct dib7000p_state *state = demod->demodulator_priv;
1302 if (state->version == SOC7090)
1303 return dib7090_set_output_mode(demod, OUTMODE_HIGH_Z) | dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);
1055 return dib7000p_set_output_mode(state, OUTMODE_HIGH_Z) | dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY); 1304 return dib7000p_set_output_mode(state, OUTMODE_HIGH_Z) | dib7000p_set_power_mode(state, DIB7000P_POWER_INTERFACE_ONLY);
1056} 1305}
1057 1306
1058static int dib7000p_identify(struct dib7000p_state *st) 1307static int dib7000p_identify(struct dib7000p_state *st)
1059{ 1308{
1060 u16 value; 1309 u16 value;
1061 dprintk( "checking demod on I2C address: %d (%x)", 1310 dprintk("checking demod on I2C address: %d (%x)", st->i2c_addr, st->i2c_addr);
1062 st->i2c_addr, st->i2c_addr);
1063 1311
1064 if ((value = dib7000p_read_word(st, 768)) != 0x01b3) { 1312 if ((value = dib7000p_read_word(st, 768)) != 0x01b3) {
1065 dprintk( "wrong Vendor ID (read=0x%x)",value); 1313 dprintk("wrong Vendor ID (read=0x%x)", value);
1066 return -EREMOTEIO; 1314 return -EREMOTEIO;
1067 } 1315 }
1068 1316
1069 if ((value = dib7000p_read_word(st, 769)) != 0x4000) { 1317 if ((value = dib7000p_read_word(st, 769)) != 0x4000) {
1070 dprintk( "wrong Device ID (%x)",value); 1318 dprintk("wrong Device ID (%x)", value);
1071 return -EREMOTEIO; 1319 return -EREMOTEIO;
1072 } 1320 }
1073 1321
1074 return 0; 1322 return 0;
1075} 1323}
1076 1324
1077 1325static int dib7000p_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
1078static int dib7000p_get_frontend(struct dvb_frontend* fe,
1079 struct dvb_frontend_parameters *fep)
1080{ 1326{
1081 struct dib7000p_state *state = fe->demodulator_priv; 1327 struct dib7000p_state *state = fe->demodulator_priv;
1082 u16 tps = dib7000p_read_word(state,463); 1328 u16 tps = dib7000p_read_word(state, 463);
1083 1329
1084 fep->inversion = INVERSION_AUTO; 1330 fep->inversion = INVERSION_AUTO;
1085 1331
1086 fep->u.ofdm.bandwidth = BANDWIDTH_TO_INDEX(state->current_bandwidth); 1332 fep->u.ofdm.bandwidth = BANDWIDTH_TO_INDEX(state->current_bandwidth);
1087 1333
1088 switch ((tps >> 8) & 0x3) { 1334 switch ((tps >> 8) & 0x3) {
1089 case 0: fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K; break; 1335 case 0:
1090 case 1: fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_8K; break; 1336 fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
1337 break;
1338 case 1:
1339 fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
1340 break;
1091 /* case 2: fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_4K; break; */ 1341 /* case 2: fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_4K; break; */
1092 } 1342 }
1093 1343
1094 switch (tps & 0x3) { 1344 switch (tps & 0x3) {
1095 case 0: fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_32; break; 1345 case 0:
1096 case 1: fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_16; break; 1346 fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
1097 case 2: fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_8; break; 1347 break;
1098 case 3: fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_4; break; 1348 case 1:
1349 fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_16;
1350 break;
1351 case 2:
1352 fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_8;
1353 break;
1354 case 3:
1355 fep->u.ofdm.guard_interval = GUARD_INTERVAL_1_4;
1356 break;
1099 } 1357 }
1100 1358
1101 switch ((tps >> 14) & 0x3) { 1359 switch ((tps >> 14) & 0x3) {
1102 case 0: fep->u.ofdm.constellation = QPSK; break; 1360 case 0:
1103 case 1: fep->u.ofdm.constellation = QAM_16; break; 1361 fep->u.ofdm.constellation = QPSK;
1104 case 2: 1362 break;
1105 default: fep->u.ofdm.constellation = QAM_64; break; 1363 case 1:
1364 fep->u.ofdm.constellation = QAM_16;
1365 break;
1366 case 2:
1367 default:
1368 fep->u.ofdm.constellation = QAM_64;
1369 break;
1106 } 1370 }
1107 1371
1108 /* as long as the frontend_param structure is fixed for hierarchical transmission I refuse to use it */ 1372 /* as long as the frontend_param structure is fixed for hierarchical transmission I refuse to use it */
@@ -1110,22 +1374,42 @@ static int dib7000p_get_frontend(struct dvb_frontend* fe,
1110 1374
1111 fep->u.ofdm.hierarchy_information = HIERARCHY_NONE; 1375 fep->u.ofdm.hierarchy_information = HIERARCHY_NONE;
1112 switch ((tps >> 5) & 0x7) { 1376 switch ((tps >> 5) & 0x7) {
1113 case 1: fep->u.ofdm.code_rate_HP = FEC_1_2; break; 1377 case 1:
1114 case 2: fep->u.ofdm.code_rate_HP = FEC_2_3; break; 1378 fep->u.ofdm.code_rate_HP = FEC_1_2;
1115 case 3: fep->u.ofdm.code_rate_HP = FEC_3_4; break; 1379 break;
1116 case 5: fep->u.ofdm.code_rate_HP = FEC_5_6; break; 1380 case 2:
1117 case 7: 1381 fep->u.ofdm.code_rate_HP = FEC_2_3;
1118 default: fep->u.ofdm.code_rate_HP = FEC_7_8; break; 1382 break;
1383 case 3:
1384 fep->u.ofdm.code_rate_HP = FEC_3_4;
1385 break;
1386 case 5:
1387 fep->u.ofdm.code_rate_HP = FEC_5_6;
1388 break;
1389 case 7:
1390 default:
1391 fep->u.ofdm.code_rate_HP = FEC_7_8;
1392 break;
1119 1393
1120 } 1394 }
1121 1395
1122 switch ((tps >> 2) & 0x7) { 1396 switch ((tps >> 2) & 0x7) {
1123 case 1: fep->u.ofdm.code_rate_LP = FEC_1_2; break; 1397 case 1:
1124 case 2: fep->u.ofdm.code_rate_LP = FEC_2_3; break; 1398 fep->u.ofdm.code_rate_LP = FEC_1_2;
1125 case 3: fep->u.ofdm.code_rate_LP = FEC_3_4; break; 1399 break;
1126 case 5: fep->u.ofdm.code_rate_LP = FEC_5_6; break; 1400 case 2:
1127 case 7: 1401 fep->u.ofdm.code_rate_LP = FEC_2_3;
1128 default: fep->u.ofdm.code_rate_LP = FEC_7_8; break; 1402 break;
1403 case 3:
1404 fep->u.ofdm.code_rate_LP = FEC_3_4;
1405 break;
1406 case 5:
1407 fep->u.ofdm.code_rate_LP = FEC_5_6;
1408 break;
1409 case 7:
1410 default:
1411 fep->u.ofdm.code_rate_LP = FEC_7_8;
1412 break;
1129 } 1413 }
1130 1414
1131 /* native interleaver: (dib7000p_read_word(state, 464) >> 5) & 0x1 */ 1415 /* native interleaver: (dib7000p_read_word(state, 464) >> 5) & 0x1 */
@@ -1133,15 +1417,19 @@ static int dib7000p_get_frontend(struct dvb_frontend* fe,
1133 return 0; 1417 return 0;
1134} 1418}
1135 1419
1136static int dib7000p_set_frontend(struct dvb_frontend* fe, 1420static int dib7000p_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
1137 struct dvb_frontend_parameters *fep)
1138{ 1421{
1139 struct dib7000p_state *state = fe->demodulator_priv; 1422 struct dib7000p_state *state = fe->demodulator_priv;
1140 int time, ret; 1423 int time, ret;
1141 1424
1142 dib7000p_set_output_mode(state, OUTMODE_HIGH_Z); 1425 if (state->version == SOC7090) {
1426 dib7090_set_diversity_in(fe, 0);
1427 dib7090_set_output_mode(fe, OUTMODE_HIGH_Z);
1428 }
1429 else
1430 dib7000p_set_output_mode(state, OUTMODE_HIGH_Z);
1143 1431
1144 /* maybe the parameter has been changed */ 1432 /* maybe the parameter has been changed */
1145 state->sfn_workaround_active = buggy_sfn_workaround; 1433 state->sfn_workaround_active = buggy_sfn_workaround;
1146 1434
1147 if (fe->ops.tuner_ops.set_params) 1435 if (fe->ops.tuner_ops.set_params)
@@ -1156,9 +1444,7 @@ static int dib7000p_set_frontend(struct dvb_frontend* fe,
1156 } while (time != -1); 1444 } while (time != -1);
1157 1445
1158 if (fep->u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO || 1446 if (fep->u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO ||
1159 fep->u.ofdm.guard_interval == GUARD_INTERVAL_AUTO || 1447 fep->u.ofdm.guard_interval == GUARD_INTERVAL_AUTO || fep->u.ofdm.constellation == QAM_AUTO || fep->u.ofdm.code_rate_HP == FEC_AUTO) {
1160 fep->u.ofdm.constellation == QAM_AUTO ||
1161 fep->u.ofdm.code_rate_HP == FEC_AUTO) {
1162 int i = 800, found; 1448 int i = 800, found;
1163 1449
1164 dib7000p_autosearch_start(fe, fep); 1450 dib7000p_autosearch_start(fe, fep);
@@ -1167,9 +1453,9 @@ static int dib7000p_set_frontend(struct dvb_frontend* fe,
1167 found = dib7000p_autosearch_is_irq(fe); 1453 found = dib7000p_autosearch_is_irq(fe);
1168 } while (found == 0 && i--); 1454 } while (found == 0 && i--);
1169 1455
1170 dprintk("autosearch returns: %d",found); 1456 dprintk("autosearch returns: %d", found);
1171 if (found == 0 || found == 1) 1457 if (found == 0 || found == 1)
1172 return 0; // no channel found 1458 return 0; // no channel found
1173 1459
1174 dib7000p_get_frontend(fe, fep); 1460 dib7000p_get_frontend(fe, fep);
1175 } 1461 }
@@ -1177,11 +1463,15 @@ static int dib7000p_set_frontend(struct dvb_frontend* fe,
1177 ret = dib7000p_tune(fe, fep); 1463 ret = dib7000p_tune(fe, fep);
1178 1464
1179 /* make this a config parameter */ 1465 /* make this a config parameter */
1180 dib7000p_set_output_mode(state, state->cfg.output_mode); 1466 if (state->version == SOC7090)
1181 return ret; 1467 dib7090_set_output_mode(fe, state->cfg.output_mode);
1468 else
1469 dib7000p_set_output_mode(state, state->cfg.output_mode);
1470
1471 return ret;
1182} 1472}
1183 1473
1184static int dib7000p_read_status(struct dvb_frontend *fe, fe_status_t *stat) 1474static int dib7000p_read_status(struct dvb_frontend *fe, fe_status_t * stat)
1185{ 1475{
1186 struct dib7000p_state *state = fe->demodulator_priv; 1476 struct dib7000p_state *state = fe->demodulator_priv;
1187 u16 lock = dib7000p_read_word(state, 509); 1477 u16 lock = dib7000p_read_word(state, 509);
@@ -1196,27 +1486,27 @@ static int dib7000p_read_status(struct dvb_frontend *fe, fe_status_t *stat)
1196 *stat |= FE_HAS_VITERBI; 1486 *stat |= FE_HAS_VITERBI;
1197 if (lock & 0x0010) 1487 if (lock & 0x0010)
1198 *stat |= FE_HAS_SYNC; 1488 *stat |= FE_HAS_SYNC;
1199 if ((lock & 0x0038) == 0x38) 1489 if ((lock & 0x0038) == 0x38)
1200 *stat |= FE_HAS_LOCK; 1490 *stat |= FE_HAS_LOCK;
1201 1491
1202 return 0; 1492 return 0;
1203} 1493}
1204 1494
1205static int dib7000p_read_ber(struct dvb_frontend *fe, u32 *ber) 1495static int dib7000p_read_ber(struct dvb_frontend *fe, u32 * ber)
1206{ 1496{
1207 struct dib7000p_state *state = fe->demodulator_priv; 1497 struct dib7000p_state *state = fe->demodulator_priv;
1208 *ber = (dib7000p_read_word(state, 500) << 16) | dib7000p_read_word(state, 501); 1498 *ber = (dib7000p_read_word(state, 500) << 16) | dib7000p_read_word(state, 501);
1209 return 0; 1499 return 0;
1210} 1500}
1211 1501
1212static int dib7000p_read_unc_blocks(struct dvb_frontend *fe, u32 *unc) 1502static int dib7000p_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
1213{ 1503{
1214 struct dib7000p_state *state = fe->demodulator_priv; 1504 struct dib7000p_state *state = fe->demodulator_priv;
1215 *unc = dib7000p_read_word(state, 506); 1505 *unc = dib7000p_read_word(state, 506);
1216 return 0; 1506 return 0;
1217} 1507}
1218 1508
1219static int dib7000p_read_signal_strength(struct dvb_frontend *fe, u16 *strength) 1509static int dib7000p_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
1220{ 1510{
1221 struct dib7000p_state *state = fe->demodulator_priv; 1511 struct dib7000p_state *state = fe->demodulator_priv;
1222 u16 val = dib7000p_read_word(state, 394); 1512 u16 val = dib7000p_read_word(state, 394);
@@ -1224,7 +1514,7 @@ static int dib7000p_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
1224 return 0; 1514 return 0;
1225} 1515}
1226 1516
1227static int dib7000p_read_snr(struct dvb_frontend* fe, u16 *snr) 1517static int dib7000p_read_snr(struct dvb_frontend *fe, u16 * snr)
1228{ 1518{
1229 struct dib7000p_state *state = fe->demodulator_priv; 1519 struct dib7000p_state *state = fe->demodulator_priv;
1230 u16 val; 1520 u16 val;
@@ -1240,19 +1530,17 @@ static int dib7000p_read_snr(struct dvb_frontend* fe, u16 *snr)
1240 noise_exp -= 0x40; 1530 noise_exp -= 0x40;
1241 1531
1242 signal_mant = (val >> 6) & 0xFF; 1532 signal_mant = (val >> 6) & 0xFF;
1243 signal_exp = (val & 0x3F); 1533 signal_exp = (val & 0x3F);
1244 if ((signal_exp & 0x20) != 0) 1534 if ((signal_exp & 0x20) != 0)
1245 signal_exp -= 0x40; 1535 signal_exp -= 0x40;
1246 1536
1247 if (signal_mant != 0) 1537 if (signal_mant != 0)
1248 result = intlog10(2) * 10 * signal_exp + 10 * 1538 result = intlog10(2) * 10 * signal_exp + 10 * intlog10(signal_mant);
1249 intlog10(signal_mant);
1250 else 1539 else
1251 result = intlog10(2) * 10 * signal_exp - 100; 1540 result = intlog10(2) * 10 * signal_exp - 100;
1252 1541
1253 if (noise_mant != 0) 1542 if (noise_mant != 0)
1254 result -= intlog10(2) * 10 * noise_exp + 10 * 1543 result -= intlog10(2) * 10 * noise_exp + 10 * intlog10(noise_mant);
1255 intlog10(noise_mant);
1256 else 1544 else
1257 result -= intlog10(2) * 10 * noise_exp - 100; 1545 result -= intlog10(2) * 10 * noise_exp - 100;
1258 1546
@@ -1260,7 +1548,7 @@ static int dib7000p_read_snr(struct dvb_frontend* fe, u16 *snr)
1260 return 0; 1548 return 0;
1261} 1549}
1262 1550
1263static int dib7000p_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune) 1551static int dib7000p_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune)
1264{ 1552{
1265 tune->min_delay_ms = 1000; 1553 tune->min_delay_ms = 1000;
1266 return 0; 1554 return 0;
@@ -1270,6 +1558,7 @@ static void dib7000p_release(struct dvb_frontend *demod)
1270{ 1558{
1271 struct dib7000p_state *st = demod->demodulator_priv; 1559 struct dib7000p_state *st = demod->demodulator_priv;
1272 dibx000_exit_i2c_master(&st->i2c_master); 1560 dibx000_exit_i2c_master(&st->i2c_master);
1561 i2c_del_adapter(&st->dib7090_tuner_adap);
1273 kfree(st); 1562 kfree(st);
1274} 1563}
1275 1564
@@ -1277,8 +1566,8 @@ int dib7000pc_detection(struct i2c_adapter *i2c_adap)
1277{ 1566{
1278 u8 tx[2], rx[2]; 1567 u8 tx[2], rx[2];
1279 struct i2c_msg msg[2] = { 1568 struct i2c_msg msg[2] = {
1280 { .addr = 18 >> 1, .flags = 0, .buf = tx, .len = 2 }, 1569 {.addr = 18 >> 1,.flags = 0,.buf = tx,.len = 2},
1281 { .addr = 18 >> 1, .flags = I2C_M_RD, .buf = rx, .len = 2 }, 1570 {.addr = 18 >> 1,.flags = I2C_M_RD,.buf = rx,.len = 2},
1282 }; 1571 };
1283 1572
1284 tx[0] = 0x03; 1573 tx[0] = 0x03;
@@ -1303,7 +1592,7 @@ int dib7000pc_detection(struct i2c_adapter *i2c_adap)
1303} 1592}
1304EXPORT_SYMBOL(dib7000pc_detection); 1593EXPORT_SYMBOL(dib7000pc_detection);
1305 1594
1306struct i2c_adapter * dib7000p_get_i2c_master(struct dvb_frontend *demod, enum dibx000_i2c_interface intf, int gating) 1595struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *demod, enum dibx000_i2c_interface intf, int gating)
1307{ 1596{
1308 struct dib7000p_state *st = demod->demodulator_priv; 1597 struct dib7000p_state *st = demod->demodulator_priv;
1309 return dibx000_get_i2c_adapter(&st->i2c_master, intf, gating); 1598 return dibx000_get_i2c_adapter(&st->i2c_master, intf, gating);
@@ -1312,19 +1601,19 @@ EXPORT_SYMBOL(dib7000p_get_i2c_master);
1312 1601
1313int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff) 1602int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
1314{ 1603{
1315 struct dib7000p_state *state = fe->demodulator_priv; 1604 struct dib7000p_state *state = fe->demodulator_priv;
1316 u16 val = dib7000p_read_word(state, 235) & 0xffef; 1605 u16 val = dib7000p_read_word(state, 235) & 0xffef;
1317 val |= (onoff & 0x1) << 4; 1606 val |= (onoff & 0x1) << 4;
1318 dprintk("PID filter enabled %d", onoff); 1607 dprintk("PID filter enabled %d", onoff);
1319 return dib7000p_write_word(state, 235, val); 1608 return dib7000p_write_word(state, 235, val);
1320} 1609}
1321EXPORT_SYMBOL(dib7000p_pid_filter_ctrl); 1610EXPORT_SYMBOL(dib7000p_pid_filter_ctrl);
1322 1611
1323int dib7000p_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff) 1612int dib7000p_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
1324{ 1613{
1325 struct dib7000p_state *state = fe->demodulator_priv; 1614 struct dib7000p_state *state = fe->demodulator_priv;
1326 dprintk("PID filter: index %x, PID %d, OnOff %d", id, pid, onoff); 1615 dprintk("PID filter: index %x, PID %d, OnOff %d", id, pid, onoff);
1327 return dib7000p_write_word(state, 241 + id, onoff ? (1 << 13) | pid : 0); 1616 return dib7000p_write_word(state, 241 + id, onoff ? (1 << 13) | pid : 0);
1328} 1617}
1329EXPORT_SYMBOL(dib7000p_pid_filter); 1618EXPORT_SYMBOL(dib7000p_pid_filter);
1330 1619
@@ -1340,16 +1629,19 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
1340 1629
1341 dpst->i2c_adap = i2c; 1630 dpst->i2c_adap = i2c;
1342 1631
1343 for (k = no_of_demods-1; k >= 0; k--) { 1632 for (k = no_of_demods - 1; k >= 0; k--) {
1344 dpst->cfg = cfg[k]; 1633 dpst->cfg = cfg[k];
1345 1634
1346 /* designated i2c address */ 1635 /* designated i2c address */
1347 new_addr = (0x40 + k) << 1; 1636 if (cfg[k].default_i2c_addr != 0)
1637 new_addr = cfg[k].default_i2c_addr + (k << 1);
1638 else
1639 new_addr = (0x40 + k) << 1;
1348 dpst->i2c_addr = new_addr; 1640 dpst->i2c_addr = new_addr;
1349 dib7000p_write_word(dpst, 1287, 0x0003); /* sram lead in, rdy */ 1641 dib7000p_write_word(dpst, 1287, 0x0003); /* sram lead in, rdy */
1350 if (dib7000p_identify(dpst) != 0) { 1642 if (dib7000p_identify(dpst) != 0) {
1351 dpst->i2c_addr = default_addr; 1643 dpst->i2c_addr = default_addr;
1352 dib7000p_write_word(dpst, 1287, 0x0003); /* sram lead in, rdy */ 1644 dib7000p_write_word(dpst, 1287, 0x0003); /* sram lead in, rdy */
1353 if (dib7000p_identify(dpst) != 0) { 1645 if (dib7000p_identify(dpst) != 0) {
1354 dprintk("DiB7000P #%d: not identified\n", k); 1646 dprintk("DiB7000P #%d: not identified\n", k);
1355 kfree(dpst); 1647 kfree(dpst);
@@ -1368,7 +1660,10 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
1368 1660
1369 for (k = 0; k < no_of_demods; k++) { 1661 for (k = 0; k < no_of_demods; k++) {
1370 dpst->cfg = cfg[k]; 1662 dpst->cfg = cfg[k];
1371 dpst->i2c_addr = (0x40 + k) << 1; 1663 if (cfg[k].default_i2c_addr != 0)
1664 dpst->i2c_addr = (cfg[k].default_i2c_addr + k) << 1;
1665 else
1666 dpst->i2c_addr = (0x40 + k) << 1;
1372 1667
1373 // unforce divstr 1668 // unforce divstr
1374 dib7000p_write_word(dpst, 1285, dpst->i2c_addr << 2); 1669 dib7000p_write_word(dpst, 1285, dpst->i2c_addr << 2);
@@ -1382,8 +1677,616 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
1382} 1677}
1383EXPORT_SYMBOL(dib7000p_i2c_enumeration); 1678EXPORT_SYMBOL(dib7000p_i2c_enumeration);
1384 1679
1680static const s32 lut_1000ln_mant[] = {
1681 6908, 6956, 7003, 7047, 7090, 7131, 7170, 7208, 7244, 7279, 7313, 7346, 7377, 7408, 7438, 7467, 7495, 7523, 7549, 7575, 7600
1682};
1683
1684static s32 dib7000p_get_adc_power(struct dvb_frontend *fe)
1685{
1686 struct dib7000p_state *state = fe->demodulator_priv;
1687 u32 tmp_val = 0, exp = 0, mant = 0;
1688 s32 pow_i;
1689 u16 buf[2];
1690 u8 ix = 0;
1691
1692 buf[0] = dib7000p_read_word(state, 0x184);
1693 buf[1] = dib7000p_read_word(state, 0x185);
1694 pow_i = (buf[0] << 16) | buf[1];
1695 dprintk("raw pow_i = %d", pow_i);
1696
1697 tmp_val = pow_i;
1698 while (tmp_val >>= 1)
1699 exp++;
1700
1701 mant = (pow_i * 1000 / (1 << exp));
1702 dprintk(" mant = %d exp = %d", mant / 1000, exp);
1703
1704 ix = (u8) ((mant - 1000) / 100); /* index of the LUT */
1705 dprintk(" ix = %d", ix);
1706
1707 pow_i = (lut_1000ln_mant[ix] + 693 * (exp - 20) - 6908);
1708 pow_i = (pow_i << 8) / 1000;
1709 dprintk(" pow_i = %d", pow_i);
1710
1711 return pow_i;
1712}
1713
1714static int map_addr_to_serpar_number(struct i2c_msg *msg)
1715{
1716 if ((msg->buf[0] <= 15))
1717 msg->buf[0] -= 1;
1718 else if (msg->buf[0] == 17)
1719 msg->buf[0] = 15;
1720 else if (msg->buf[0] == 16)
1721 msg->buf[0] = 17;
1722 else if (msg->buf[0] == 19)
1723 msg->buf[0] = 16;
1724 else if (msg->buf[0] >= 21 && msg->buf[0] <= 25)
1725 msg->buf[0] -= 3;
1726 else if (msg->buf[0] == 28)
1727 msg->buf[0] = 23;
1728 else {
1729 return -EINVAL;
1730 }
1731 return 0;
1732}
1733
1734static int w7090p_tuner_write_serpar(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num)
1735{
1736 struct dib7000p_state *state = i2c_get_adapdata(i2c_adap);
1737 u8 n_overflow = 1;
1738 u16 i = 1000;
1739 u16 serpar_num = msg[0].buf[0];
1740
1741 while (n_overflow == 1 && i) {
1742 n_overflow = (dib7000p_read_word(state, 1984) >> 1) & 0x1;
1743 i--;
1744 if (i == 0)
1745 dprintk("Tuner ITF: write busy (overflow)");
1746 }
1747 dib7000p_write_word(state, 1985, (1 << 6) | (serpar_num & 0x3f));
1748 dib7000p_write_word(state, 1986, (msg[0].buf[1] << 8) | msg[0].buf[2]);
1749
1750 return num;
1751}
1752
1753static int w7090p_tuner_read_serpar(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num)
1754{
1755 struct dib7000p_state *state = i2c_get_adapdata(i2c_adap);
1756 u8 n_overflow = 1, n_empty = 1;
1757 u16 i = 1000;
1758 u16 serpar_num = msg[0].buf[0];
1759 u16 read_word;
1760
1761 while (n_overflow == 1 && i) {
1762 n_overflow = (dib7000p_read_word(state, 1984) >> 1) & 0x1;
1763 i--;
1764 if (i == 0)
1765 dprintk("TunerITF: read busy (overflow)");
1766 }
1767 dib7000p_write_word(state, 1985, (0 << 6) | (serpar_num & 0x3f));
1768
1769 i = 1000;
1770 while (n_empty == 1 && i) {
1771 n_empty = dib7000p_read_word(state, 1984) & 0x1;
1772 i--;
1773 if (i == 0)
1774 dprintk("TunerITF: read busy (empty)");
1775 }
1776 read_word = dib7000p_read_word(state, 1987);
1777 msg[1].buf[0] = (read_word >> 8) & 0xff;
1778 msg[1].buf[1] = (read_word) & 0xff;
1779
1780 return num;
1781}
1782
1783static int w7090p_tuner_rw_serpar(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num)
1784{
1785 if (map_addr_to_serpar_number(&msg[0]) == 0) { /* else = Tuner regs to ignore : DIG_CFG, CTRL_RF_LT, PLL_CFG, PWM1_REG, ADCCLK, DIG_CFG_3; SLEEP_EN... */
1786 if (num == 1) { /* write */
1787 return w7090p_tuner_write_serpar(i2c_adap, msg, 1);
1788 } else { /* read */
1789 return w7090p_tuner_read_serpar(i2c_adap, msg, 2);
1790 }
1791 }
1792 return num;
1793}
1794
1795int dib7090p_rw_on_apb(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num, u16 apb_address)
1796{
1797 struct dib7000p_state *state = i2c_get_adapdata(i2c_adap);
1798 u16 word;
1799
1800 if (num == 1) { /* write */
1801 dib7000p_write_word(state, apb_address, ((msg[0].buf[1] << 8) | (msg[0].buf[2])));
1802 } else {
1803 word = dib7000p_read_word(state, apb_address);
1804 msg[1].buf[0] = (word >> 8) & 0xff;
1805 msg[1].buf[1] = (word) & 0xff;
1806 }
1807
1808 return num;
1809}
1810
1811static int dib7090_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num)
1812{
1813 struct dib7000p_state *state = i2c_get_adapdata(i2c_adap);
1814
1815 u16 apb_address = 0, word;
1816 int i = 0;
1817 switch (msg[0].buf[0]) {
1818 case 0x12:
1819 apb_address = 1920;
1820 break;
1821 case 0x14:
1822 apb_address = 1921;
1823 break;
1824 case 0x24:
1825 apb_address = 1922;
1826 break;
1827 case 0x1a:
1828 apb_address = 1923;
1829 break;
1830 case 0x22:
1831 apb_address = 1924;
1832 break;
1833 case 0x33:
1834 apb_address = 1926;
1835 break;
1836 case 0x34:
1837 apb_address = 1927;
1838 break;
1839 case 0x35:
1840 apb_address = 1928;
1841 break;
1842 case 0x36:
1843 apb_address = 1929;
1844 break;
1845 case 0x37:
1846 apb_address = 1930;
1847 break;
1848 case 0x38:
1849 apb_address = 1931;
1850 break;
1851 case 0x39:
1852 apb_address = 1932;
1853 break;
1854 case 0x2a:
1855 apb_address = 1935;
1856 break;
1857 case 0x2b:
1858 apb_address = 1936;
1859 break;
1860 case 0x2c:
1861 apb_address = 1937;
1862 break;
1863 case 0x2d:
1864 apb_address = 1938;
1865 break;
1866 case 0x2e:
1867 apb_address = 1939;
1868 break;
1869 case 0x2f:
1870 apb_address = 1940;
1871 break;
1872 case 0x30:
1873 apb_address = 1941;
1874 break;
1875 case 0x31:
1876 apb_address = 1942;
1877 break;
1878 case 0x32:
1879 apb_address = 1943;
1880 break;
1881 case 0x3e:
1882 apb_address = 1944;
1883 break;
1884 case 0x3f:
1885 apb_address = 1945;
1886 break;
1887 case 0x40:
1888 apb_address = 1948;
1889 break;
1890 case 0x25:
1891 apb_address = 914;
1892 break;
1893 case 0x26:
1894 apb_address = 915;
1895 break;
1896 case 0x27:
1897 apb_address = 916;
1898 break;
1899 case 0x28:
1900 apb_address = 917;
1901 break;
1902 case 0x1d:
1903 i = ((dib7000p_read_word(state, 72) >> 12) & 0x3);
1904 word = dib7000p_read_word(state, 384 + i);
1905 msg[1].buf[0] = (word >> 8) & 0xff;
1906 msg[1].buf[1] = (word) & 0xff;
1907 return num;
1908 case 0x1f:
1909 if (num == 1) { /* write */
1910 word = (u16) ((msg[0].buf[1] << 8) | msg[0].buf[2]);
1911 word &= 0x3;
1912 word = (dib7000p_read_word(state, 72) & ~(3 << 12)) | (word << 12); //Mask bit 12,13
1913 dib7000p_write_word(state, 72, word); /* Set the proper input */
1914 return num;
1915 }
1916 }
1917
1918 if (apb_address != 0) /* R/W acces via APB */
1919 return dib7090p_rw_on_apb(i2c_adap, msg, num, apb_address);
1920 else /* R/W access via SERPAR */
1921 return w7090p_tuner_rw_serpar(i2c_adap, msg, num);
1922
1923 return 0;
1924}
1925
1926static u32 dib7000p_i2c_func(struct i2c_adapter *adapter)
1927{
1928 return I2C_FUNC_I2C;
1929}
1930
1931static struct i2c_algorithm dib7090_tuner_xfer_algo = {
1932 .master_xfer = dib7090_tuner_xfer,
1933 .functionality = dib7000p_i2c_func,
1934};
1935
1936struct i2c_adapter *dib7090_get_i2c_tuner(struct dvb_frontend *fe)
1937{
1938 struct dib7000p_state *st = fe->demodulator_priv;
1939 return &st->dib7090_tuner_adap;
1940}
1941EXPORT_SYMBOL(dib7090_get_i2c_tuner);
1942
1943static int dib7090_host_bus_drive(struct dib7000p_state *state, u8 drive)
1944{
1945 u16 reg;
1946
1947 /* drive host bus 2, 3, 4 */
1948 reg = dib7000p_read_word(state, 1798) & ~((0x7) | (0x7 << 6) | (0x7 << 12));
1949 reg |= (drive << 12) | (drive << 6) | drive;
1950 dib7000p_write_word(state, 1798, reg);
1951
1952 /* drive host bus 5,6 */
1953 reg = dib7000p_read_word(state, 1799) & ~((0x7 << 2) | (0x7 << 8));
1954 reg |= (drive << 8) | (drive << 2);
1955 dib7000p_write_word(state, 1799, reg);
1956
1957 /* drive host bus 7, 8, 9 */
1958 reg = dib7000p_read_word(state, 1800) & ~((0x7) | (0x7 << 6) | (0x7 << 12));
1959 reg |= (drive << 12) | (drive << 6) | drive;
1960 dib7000p_write_word(state, 1800, reg);
1961
1962 /* drive host bus 10, 11 */
1963 reg = dib7000p_read_word(state, 1801) & ~((0x7 << 2) | (0x7 << 8));
1964 reg |= (drive << 8) | (drive << 2);
1965 dib7000p_write_word(state, 1801, reg);
1966
1967 /* drive host bus 12, 13, 14 */
1968 reg = dib7000p_read_word(state, 1802) & ~((0x7) | (0x7 << 6) | (0x7 << 12));
1969 reg |= (drive << 12) | (drive << 6) | drive;
1970 dib7000p_write_word(state, 1802, reg);
1971
1972 return 0;
1973}
1974
1975static u32 dib7090_calcSyncFreq(u32 P_Kin, u32 P_Kout, u32 insertExtSynchro, u32 syncSize)
1976{
1977 u32 quantif = 3;
1978 u32 nom = (insertExtSynchro * P_Kin + syncSize);
1979 u32 denom = P_Kout;
1980 u32 syncFreq = ((nom << quantif) / denom);
1981
1982 if ((syncFreq & ((1 << quantif) - 1)) != 0)
1983 syncFreq = (syncFreq >> quantif) + 1;
1984 else
1985 syncFreq = (syncFreq >> quantif);
1986
1987 if (syncFreq != 0)
1988 syncFreq = syncFreq - 1;
1989
1990 return syncFreq;
1991}
1992
1993static int dib7090_cfg_DibTx(struct dib7000p_state *state, u32 P_Kin, u32 P_Kout, u32 insertExtSynchro, u32 synchroMode, u32 syncWord, u32 syncSize)
1994{
1995 u8 index_buf;
1996 u16 rx_copy_buf[22];
1997
1998 dprintk("Configure DibStream Tx");
1999 for (index_buf = 0; index_buf<22; index_buf++)
2000 rx_copy_buf[index_buf] = dib7000p_read_word(state, 1536+index_buf);
2001
2002 dib7000p_write_word(state, 1615, 1);
2003 dib7000p_write_word(state, 1603, P_Kin);
2004 dib7000p_write_word(state, 1605, P_Kout);
2005 dib7000p_write_word(state, 1606, insertExtSynchro);
2006 dib7000p_write_word(state, 1608, synchroMode);
2007 dib7000p_write_word(state, 1609, (syncWord >> 16) & 0xffff);
2008 dib7000p_write_word(state, 1610, syncWord & 0xffff);
2009 dib7000p_write_word(state, 1612, syncSize);
2010 dib7000p_write_word(state, 1615, 0);
2011
2012 for (index_buf = 0; index_buf<22; index_buf++)
2013 dib7000p_write_word(state, 1536+index_buf, rx_copy_buf[index_buf]);
2014
2015 return 0;
2016}
2017
2018static int dib7090_cfg_DibRx(struct dib7000p_state *state, u32 P_Kin, u32 P_Kout, u32 synchroMode, u32 insertExtSynchro, u32 syncWord, u32 syncSize,
2019 u32 dataOutRate)
2020{
2021 u32 syncFreq;
2022
2023 dprintk("Configure DibStream Rx");
2024 if ((P_Kin != 0) && (P_Kout != 0))
2025 {
2026 syncFreq = dib7090_calcSyncFreq(P_Kin, P_Kout, insertExtSynchro, syncSize);
2027 dib7000p_write_word(state, 1542, syncFreq);
2028 }
2029 dib7000p_write_word(state, 1554, 1);
2030 dib7000p_write_word(state, 1536, P_Kin);
2031 dib7000p_write_word(state, 1537, P_Kout);
2032 dib7000p_write_word(state, 1539, synchroMode);
2033 dib7000p_write_word(state, 1540, (syncWord >> 16) & 0xffff);
2034 dib7000p_write_word(state, 1541, syncWord & 0xffff);
2035 dib7000p_write_word(state, 1543, syncSize);
2036 dib7000p_write_word(state, 1544, dataOutRate);
2037 dib7000p_write_word(state, 1554, 0);
2038
2039 return 0;
2040}
2041
2042static int dib7090_enDivOnHostBus(struct dib7000p_state *state)
2043{
2044 u16 reg;
2045
2046 dprintk("Enable Diversity on host bus");
2047 reg = (1 << 8) | (1 << 5); // P_enDivOutOnDibTx = 1 ; P_enDibTxOnHostBus = 1
2048 dib7000p_write_word(state, 1288, reg);
2049
2050 return dib7090_cfg_DibTx(state, 5, 5, 0, 0, 0, 0);
2051}
2052
2053static int dib7090_enAdcOnHostBus(struct dib7000p_state *state)
2054{
2055 u16 reg;
2056
2057 dprintk("Enable ADC on host bus");
2058 reg = (1 << 7) | (1 << 5); //P_enAdcOnDibTx = 1 ; P_enDibTxOnHostBus = 1
2059 dib7000p_write_word(state, 1288, reg);
2060
2061 return dib7090_cfg_DibTx(state, 20, 5, 10, 0, 0, 0);
2062}
2063
2064static int dib7090_enMpegOnHostBus(struct dib7000p_state *state)
2065{
2066 u16 reg;
2067
2068 dprintk("Enable Mpeg on host bus");
2069 reg = (1 << 9) | (1 << 5); //P_enMpegOnDibTx = 1 ; P_enDibTxOnHostBus = 1
2070 dib7000p_write_word(state, 1288, reg);
2071
2072 return dib7090_cfg_DibTx(state, 8, 5, 0, 0, 0, 0);
2073}
2074
2075static int dib7090_enMpegInput(struct dib7000p_state *state)
2076{
2077 dprintk("Enable Mpeg input");
2078 return dib7090_cfg_DibRx(state, 8, 5, 0, 0, 0, 8, 0); /*outputRate = 8 */
2079}
2080
2081static int dib7090_enMpegMux(struct dib7000p_state *state, u16 pulseWidth, u16 enSerialMode, u16 enSerialClkDiv2)
2082{
2083 u16 reg = (1 << 7) | ((pulseWidth & 0x1f) << 2) | ((enSerialMode & 0x1) << 1) | (enSerialClkDiv2 & 0x1);
2084
2085 dprintk("Enable Mpeg mux");
2086 dib7000p_write_word(state, 1287, reg);
2087
2088 reg &= ~(1 << 7); // P_restart_mpegMux = 0
2089 dib7000p_write_word(state, 1287, reg);
2090
2091 reg = (1 << 4); //P_enMpegMuxOnHostBus = 1
2092 dib7000p_write_word(state, 1288, reg);
2093
2094 return 0;
2095}
2096
2097static int dib7090_disableMpegMux(struct dib7000p_state *state)
2098{
2099 u16 reg;
2100
2101 dprintk("Disable Mpeg mux");
2102 dib7000p_write_word(state, 1288, 0); //P_enMpegMuxOnHostBus = 0
2103
2104 reg = dib7000p_read_word(state, 1287);
2105 reg &= ~(1 << 7); // P_restart_mpegMux = 0
2106 dib7000p_write_word(state, 1287, reg);
2107
2108 return 0;
2109}
2110
2111static int dib7090_set_input_mode(struct dvb_frontend *fe, int mode)
2112{
2113 struct dib7000p_state *state = fe->demodulator_priv;
2114
2115 switch(mode) {
2116 case INPUT_MODE_DIVERSITY:
2117 dprintk("Enable diversity INPUT");
2118 dib7090_cfg_DibRx(state, 5,5,0,0,0,0,0);
2119 break;
2120 case INPUT_MODE_MPEG:
2121 dprintk("Enable Mpeg INPUT");
2122 dib7090_cfg_DibRx(state, 8,5,0,0,0,8,0); /*outputRate = 8 */
2123 break;
2124 case INPUT_MODE_OFF:
2125 default:
2126 dprintk("Disable INPUT");
2127 dib7090_cfg_DibRx(state, 0,0,0,0,0,0,0);
2128 break;
2129 }
2130 return 0;
2131}
2132
2133static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff)
2134{
2135 switch (onoff) {
2136 case 0: /* only use the internal way - not the diversity input */
2137 dib7090_set_input_mode(fe, INPUT_MODE_MPEG);
2138 break;
2139 case 1: /* both ways */
2140 case 2: /* only the diversity input */
2141 dib7090_set_input_mode(fe, INPUT_MODE_DIVERSITY);
2142 break;
2143 }
2144
2145 return 0;
2146}
2147
2148static int dib7090_set_output_mode(struct dvb_frontend *fe, int mode)
2149{
2150 struct dib7000p_state *state = fe->demodulator_priv;
2151
2152 u16 outreg, smo_mode, fifo_threshold;
2153 u8 prefer_mpeg_mux_use = 1;
2154 int ret = 0;
2155
2156 dib7090_host_bus_drive(state, 1);
2157
2158 fifo_threshold = 1792;
2159 smo_mode = (dib7000p_read_word(state, 235) & 0x0050) | (1 << 1);
2160 outreg = dib7000p_read_word(state, 1286) & ~((1 << 10) | (0x7 << 6) | (1 << 1));
2161
2162 switch (mode) {
2163 case OUTMODE_HIGH_Z:
2164 outreg = 0;
2165 break;
2166
2167 case OUTMODE_MPEG2_SERIAL:
2168 if (prefer_mpeg_mux_use) {
2169 dprintk("Sip 7090P setting output mode TS_SERIAL using Mpeg Mux");
2170 dib7090_enMpegOnHostBus(state);
2171 dib7090_enMpegInput(state);
2172 if (state->cfg.enMpegOutput == 1)
2173 dib7090_enMpegMux(state, 3, 1, 1);
2174
2175 } else { /* Use Smooth block */
2176 dprintk("Sip 7090P setting output mode TS_SERIAL using Smooth bloc");
2177 dib7090_disableMpegMux(state);
2178 dib7000p_write_word(state, 1288, (1 << 6)); //P_enDemOutInterfOnHostBus = 1
2179 outreg |= (2 << 6) | (0 << 1);
2180 }
2181 break;
2182
2183 case OUTMODE_MPEG2_PAR_GATED_CLK:
2184 if (prefer_mpeg_mux_use) {
2185 dprintk("Sip 7090P setting output mode TS_PARALLEL_GATED using Mpeg Mux");
2186 dib7090_enMpegOnHostBus(state);
2187 dib7090_enMpegInput(state);
2188 if (state->cfg.enMpegOutput == 1)
2189 dib7090_enMpegMux(state, 2, 0, 0);
2190 } else { /* Use Smooth block */
2191 dprintk("Sip 7090P setting output mode TS_PARALLEL_GATED using Smooth block");
2192 dib7090_disableMpegMux(state);
2193 dib7000p_write_word(state, 1288, (1 << 6)); //P_enDemOutInterfOnHostBus = 1
2194 outreg |= (0 << 6);
2195 }
2196 break;
2197
2198 case OUTMODE_MPEG2_PAR_CONT_CLK: /* Using Smooth block only */
2199 dprintk("Sip 7090P setting output mode TS_PARALLEL_CONT using Smooth block");
2200 dib7090_disableMpegMux(state);
2201 dib7000p_write_word(state, 1288, (1 << 6)); //P_enDemOutInterfOnHostBus = 1
2202 outreg |= (1 << 6);
2203 break;
2204
2205 case OUTMODE_MPEG2_FIFO: /* Using Smooth block because not supported by new Mpeg Mux bloc */
2206 dprintk("Sip 7090P setting output mode TS_FIFO using Smooth block");
2207 dib7090_disableMpegMux(state);
2208 dib7000p_write_word(state, 1288, (1 << 6)); //P_enDemOutInterfOnHostBus = 1
2209 outreg |= (5 << 6);
2210 smo_mode |= (3 << 1);
2211 fifo_threshold = 512;
2212 break;
2213
2214 case OUTMODE_DIVERSITY:
2215 dprintk("Sip 7090P setting output mode MODE_DIVERSITY");
2216 dib7090_disableMpegMux(state);
2217 dib7090_enDivOnHostBus(state);
2218 break;
2219
2220 case OUTMODE_ANALOG_ADC:
2221 dprintk("Sip 7090P setting output mode MODE_ANALOG_ADC");
2222 dib7090_enAdcOnHostBus(state);
2223 break;
2224 }
2225
2226 if (state->cfg.output_mpeg2_in_188_bytes)
2227 smo_mode |= (1 << 5);
2228
2229 ret |= dib7000p_write_word(state, 235, smo_mode);
2230 ret |= dib7000p_write_word(state, 236, fifo_threshold); /* synchronous fread */
2231 ret |= dib7000p_write_word(state, 1286, outreg | (1 << 10)); /* allways set Dout active = 1 !!! */
2232
2233 return ret;
2234}
2235
2236int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff)
2237{
2238 struct dib7000p_state *state = fe->demodulator_priv;
2239 u16 en_cur_state;
2240
2241 dprintk("sleep dib7090: %d", onoff);
2242
2243 en_cur_state = dib7000p_read_word(state, 1922);
2244
2245 if (en_cur_state > 0xff) { //LNAs and MIX are ON and therefore it is a valid configuration
2246 state->tuner_enable = en_cur_state;
2247 }
2248
2249 if (onoff)
2250 en_cur_state &= 0x00ff; //Mask to be applied
2251 else {
2252 if (state->tuner_enable != 0)
2253 en_cur_state = state->tuner_enable;
2254 }
2255
2256 dib7000p_write_word(state, 1922, en_cur_state);
2257
2258 return 0;
2259}
2260EXPORT_SYMBOL(dib7090_tuner_sleep);
2261
2262int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart)
2263{
2264 dprintk("AGC restart callback: %d", restart);
2265 return 0;
2266}
2267EXPORT_SYMBOL(dib7090_agc_restart);
2268
2269int dib7090_get_adc_power(struct dvb_frontend *fe)
2270{
2271 return dib7000p_get_adc_power(fe);
2272}
2273EXPORT_SYMBOL(dib7090_get_adc_power);
2274
2275int dib7090_slave_reset(struct dvb_frontend *fe)
2276{
2277 struct dib7000p_state *state = fe->demodulator_priv;
2278 u16 reg;
2279
2280 reg = dib7000p_read_word(state, 1794);
2281 dib7000p_write_word(state, 1794, reg | (4 << 12));
2282
2283 dib7000p_write_word(state, 1032, 0xffff);
2284 return 0;
2285}
2286EXPORT_SYMBOL(dib7090_slave_reset);
2287
1385static struct dvb_frontend_ops dib7000p_ops; 2288static struct dvb_frontend_ops dib7000p_ops;
1386struct dvb_frontend * dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg) 2289struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg)
1387{ 2290{
1388 struct dvb_frontend *demod; 2291 struct dvb_frontend *demod;
1389 struct dib7000p_state *st; 2292 struct dib7000p_state *st;
@@ -1400,31 +2303,44 @@ struct dvb_frontend * dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
1400 /* Ensure the output mode remains at the previous default if it's 2303 /* Ensure the output mode remains at the previous default if it's
1401 * not specifically set by the caller. 2304 * not specifically set by the caller.
1402 */ 2305 */
1403 if ((st->cfg.output_mode != OUTMODE_MPEG2_SERIAL) && 2306 if ((st->cfg.output_mode != OUTMODE_MPEG2_SERIAL) && (st->cfg.output_mode != OUTMODE_MPEG2_PAR_GATED_CLK))
1404 (st->cfg.output_mode != OUTMODE_MPEG2_PAR_GATED_CLK))
1405 st->cfg.output_mode = OUTMODE_MPEG2_FIFO; 2307 st->cfg.output_mode = OUTMODE_MPEG2_FIFO;
1406 2308
1407 demod = &st->demod; 2309 demod = &st->demod;
1408 demod->demodulator_priv = st; 2310 demod->demodulator_priv = st;
1409 memcpy(&st->demod.ops, &dib7000p_ops, sizeof(struct dvb_frontend_ops)); 2311 memcpy(&st->demod.ops, &dib7000p_ops, sizeof(struct dvb_frontend_ops));
1410 2312
1411 dib7000p_write_word(st, 1287, 0x0003); /* sram lead in, rdy */ 2313 dib7000p_write_word(st, 1287, 0x0003); /* sram lead in, rdy */
1412 2314
1413 if (dib7000p_identify(st) != 0) 2315 if (dib7000p_identify(st) != 0)
1414 goto error; 2316 goto error;
1415 2317
2318 st->version = dib7000p_read_word(st, 897);
2319
1416 /* FIXME: make sure the dev.parent field is initialized, or else 2320 /* FIXME: make sure the dev.parent field is initialized, or else
1417 request_firmware() will hit an OOPS (this should be moved somewhere 2321 request_firmware() will hit an OOPS (this should be moved somewhere
1418 more common) */ 2322 more common) */
1419 st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent;
1420 2323
1421 dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); 2324 dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr);
1422 2325
2326 /* init 7090 tuner adapter */
2327 strncpy(st->dib7090_tuner_adap.name, "DiB7090 tuner interface", sizeof(st->dib7090_tuner_adap.name));
2328 st->dib7090_tuner_adap.algo = &dib7090_tuner_xfer_algo;
2329 st->dib7090_tuner_adap.algo_data = NULL;
2330 st->dib7090_tuner_adap.dev.parent = st->i2c_adap->dev.parent;
2331 i2c_set_adapdata(&st->dib7090_tuner_adap, st);
2332 i2c_add_adapter(&st->dib7090_tuner_adap);
2333
1423 dib7000p_demod_reset(st); 2334 dib7000p_demod_reset(st);
1424 2335
2336 if (st->version == SOC7090) {
2337 dib7090_set_output_mode(demod, st->cfg.output_mode);
2338 dib7090_set_diversity_in(demod, 0);
2339 }
2340
1425 return demod; 2341 return demod;
1426 2342
1427error: 2343 error:
1428 kfree(st); 2344 kfree(st);
1429 return NULL; 2345 return NULL;
1430} 2346}
@@ -1432,37 +2348,35 @@ EXPORT_SYMBOL(dib7000p_attach);
1432 2348
1433static struct dvb_frontend_ops dib7000p_ops = { 2349static struct dvb_frontend_ops dib7000p_ops = {
1434 .info = { 2350 .info = {
1435 .name = "DiBcom 7000PC", 2351 .name = "DiBcom 7000PC",
1436 .type = FE_OFDM, 2352 .type = FE_OFDM,
1437 .frequency_min = 44250000, 2353 .frequency_min = 44250000,
1438 .frequency_max = 867250000, 2354 .frequency_max = 867250000,
1439 .frequency_stepsize = 62500, 2355 .frequency_stepsize = 62500,
1440 .caps = FE_CAN_INVERSION_AUTO | 2356 .caps = FE_CAN_INVERSION_AUTO |
1441 FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | 2357 FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
1442 FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | 2358 FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
1443 FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO | 2359 FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
1444 FE_CAN_TRANSMISSION_MODE_AUTO | 2360 FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_RECOVER | FE_CAN_HIERARCHY_AUTO,
1445 FE_CAN_GUARD_INTERVAL_AUTO | 2361 },
1446 FE_CAN_RECOVER | 2362
1447 FE_CAN_HIERARCHY_AUTO, 2363 .release = dib7000p_release,
1448 }, 2364
1449 2365 .init = dib7000p_wakeup,
1450 .release = dib7000p_release, 2366 .sleep = dib7000p_sleep,
1451 2367
1452 .init = dib7000p_wakeup, 2368 .set_frontend = dib7000p_set_frontend,
1453 .sleep = dib7000p_sleep, 2369 .get_tune_settings = dib7000p_fe_get_tune_settings,
1454 2370 .get_frontend = dib7000p_get_frontend,
1455 .set_frontend = dib7000p_set_frontend, 2371
1456 .get_tune_settings = dib7000p_fe_get_tune_settings, 2372 .read_status = dib7000p_read_status,
1457 .get_frontend = dib7000p_get_frontend, 2373 .read_ber = dib7000p_read_ber,
1458
1459 .read_status = dib7000p_read_status,
1460 .read_ber = dib7000p_read_ber,
1461 .read_signal_strength = dib7000p_read_signal_strength, 2374 .read_signal_strength = dib7000p_read_signal_strength,
1462 .read_snr = dib7000p_read_snr, 2375 .read_snr = dib7000p_read_snr,
1463 .read_ucblocks = dib7000p_read_unc_blocks, 2376 .read_ucblocks = dib7000p_read_unc_blocks,
1464}; 2377};
1465 2378
2379MODULE_AUTHOR("Olivier Grenie <ogrenie@dibcom.fr>");
1466MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>"); 2380MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
1467MODULE_DESCRIPTION("Driver for the DiBcom 7000PC COFDM demodulator"); 2381MODULE_DESCRIPTION("Driver for the DiBcom 7000PC COFDM demodulator");
1468MODULE_LICENSE("GPL"); 2382MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h
index da17345bf5bd..4e3ffc888341 100644
--- a/drivers/media/dvb/frontends/dib7000p.h
+++ b/drivers/media/dvb/frontends/dib7000p.h
@@ -33,59 +33,54 @@ struct dib7000p_config {
33 int (*agc_control) (struct dvb_frontend *, u8 before); 33 int (*agc_control) (struct dvb_frontend *, u8 before);
34 34
35 u8 output_mode; 35 u8 output_mode;
36 u8 disable_sample_and_hold : 1; 36 u8 disable_sample_and_hold:1;
37 37
38 u8 enable_current_mirror : 1; 38 u8 enable_current_mirror:1;
39 u8 diversity_delay; 39 u16 diversity_delay;
40 40
41 u8 default_i2c_addr;
42 u8 enMpegOutput : 1;
41}; 43};
42 44
43#define DEFAULT_DIB7000P_I2C_ADDRESS 18 45#define DEFAULT_DIB7000P_I2C_ADDRESS 18
44 46
45#if defined(CONFIG_DVB_DIB7000P) || (defined(CONFIG_DVB_DIB7000P_MODULE) && \ 47#if defined(CONFIG_DVB_DIB7000P) || (defined(CONFIG_DVB_DIB7000P_MODULE) && \
46 defined(MODULE)) 48 defined(MODULE))
47extern struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, 49extern struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
48 u8 i2c_addr, 50extern struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int);
49 struct dib7000p_config *cfg); 51extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[]);
50extern struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *,
51 enum dibx000_i2c_interface,
52 int);
53extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
54 int no_of_demods, u8 default_addr,
55 struct dib7000p_config cfg[]);
56extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val); 52extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
57extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value); 53extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);
58extern int dib7000pc_detection(struct i2c_adapter *i2c_adap); 54extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);
59extern int dib7000p_pid_filter(struct dvb_frontend *, u8 id, u16 pid, u8 onoff); 55extern int dib7000p_pid_filter(struct dvb_frontend *, u8 id, u16 pid, u8 onoff);
60extern int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff); 56extern int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff);
57extern int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth_config *bw);
58extern u32 dib7000p_ctrl_timf(struct dvb_frontend *fe, u8 op, u32 timf);
59extern int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart);
60extern int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff);
61extern int dib7090_get_adc_power(struct dvb_frontend *fe);
62extern struct i2c_adapter *dib7090_get_i2c_tuner(struct dvb_frontend *fe);
63extern int dib7090_slave_reset(struct dvb_frontend *fe);
61#else 64#else
62static inline 65static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg)
63struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
64 struct dib7000p_config *cfg)
65{ 66{
66 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 67 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
67 return NULL; 68 return NULL;
68} 69}
69 70
70static inline 71static inline struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *fe, enum dibx000_i2c_interface i, int x)
71struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *fe,
72 enum dibx000_i2c_interface i,
73 int x)
74{ 72{
75 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 73 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
76 return NULL; 74 return NULL;
77} 75}
78 76
79static inline int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, 77static inline int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[])
80 int no_of_demods, u8 default_addr,
81 struct dib7000p_config cfg[])
82{ 78{
83 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 79 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
84 return -ENODEV; 80 return -ENODEV;
85} 81}
86 82
87static inline int dib7000p_set_gpio(struct dvb_frontend *fe, 83static inline int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
88 u8 num, u8 dir, u8 val)
89{ 84{
90 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 85 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
91 return -ENODEV; 86 return -ENODEV;
@@ -102,16 +97,59 @@ static inline int dib7000pc_detection(struct i2c_adapter *i2c_adap)
102 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 97 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
103 return -ENODEV; 98 return -ENODEV;
104} 99}
100
105static inline int dib7000p_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff) 101static inline int dib7000p_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
106{ 102{
107 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 103 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
108 return -ENODEV; 104 return -ENODEV;
109} 105}
110 106
111static inline int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, uint8_t onoff) 107static inline int dib7000p_pid_filter_ctrl(struct dvb_frontend *fe, uint8_t onoff)
112{ 108{
113 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 109 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
114 return -ENODEV; 110 return -ENODEV;
111}
112
113static inline int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth_config *bw)
114{
115 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
116 return -ENODEV;
117}
118
119static inline u32 dib7000p_ctrl_timf(struct dvb_frontend *fe, u8 op, u32 timf)
120{
121 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
122 return 0;
123}
124
125static inline int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart)
126{
127 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
128 return -ENODEV;
129}
130
131static inline int dib7090_tuner_sleep(struct dvb_frontend *fe, int onoff)
132{
133 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
134 return -ENODEV;
135}
136
137static inline int dib7090_get_adc_power(struct dvb_frontend *fe)
138{
139 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
140 return -ENODEV;
141}
142
143static inline struct i2c_adapter *dib7090_get_i2c_tuner(struct dvb_frontend *fe)
144{
145 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
146 return NULL;
147}
148
149static inline int dib7090_slave_reset(struct dvb_frontend *fe)
150{
151 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
152 return -ENODEV;
115} 153}
116#endif 154#endif
117 155
diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h
index c4fd62f8df51..cc0fafe0436d 100644
--- a/drivers/media/dvb/frontends/dibx000_common.h
+++ b/drivers/media/dvb/frontends/dibx000_common.h
@@ -141,8 +141,8 @@ enum dibx000_adc_states {
141}; 141};
142 142
143#define BANDWIDTH_TO_KHZ(v) ( (v) == BANDWIDTH_8_MHZ ? 8000 : \ 143#define BANDWIDTH_TO_KHZ(v) ( (v) == BANDWIDTH_8_MHZ ? 8000 : \
144 (v) == BANDWIDTH_7_MHZ ? 7000 : \ 144 (v) == BANDWIDTH_7_MHZ ? 7000 : \
145 (v) == BANDWIDTH_6_MHZ ? 6000 : 8000 ) 145 (v) == BANDWIDTH_6_MHZ ? 6000 : 8000 )
146 146
147#define BANDWIDTH_TO_INDEX(v) ( \ 147#define BANDWIDTH_TO_INDEX(v) ( \
148 (v) == 8000 ? BANDWIDTH_8_MHZ : \ 148 (v) == 8000 ? BANDWIDTH_8_MHZ : \
@@ -158,53 +158,57 @@ enum dibx000_adc_states {
158#define OUTMODE_MPEG2_FIFO 5 158#define OUTMODE_MPEG2_FIFO 5
159#define OUTMODE_ANALOG_ADC 6 159#define OUTMODE_ANALOG_ADC 6
160 160
161#define INPUT_MODE_OFF 0x11
162#define INPUT_MODE_DIVERSITY 0x12
163#define INPUT_MODE_MPEG 0x13
164
161enum frontend_tune_state { 165enum frontend_tune_state {
162 CT_TUNER_START = 10, 166 CT_TUNER_START = 10,
163 CT_TUNER_STEP_0, 167 CT_TUNER_STEP_0,
164 CT_TUNER_STEP_1, 168 CT_TUNER_STEP_1,
165 CT_TUNER_STEP_2, 169 CT_TUNER_STEP_2,
166 CT_TUNER_STEP_3, 170 CT_TUNER_STEP_3,
167 CT_TUNER_STEP_4, 171 CT_TUNER_STEP_4,
168 CT_TUNER_STEP_5, 172 CT_TUNER_STEP_5,
169 CT_TUNER_STEP_6, 173 CT_TUNER_STEP_6,
170 CT_TUNER_STEP_7, 174 CT_TUNER_STEP_7,
171 CT_TUNER_STOP, 175 CT_TUNER_STOP,
172 176
173 CT_AGC_START = 20, 177 CT_AGC_START = 20,
174 CT_AGC_STEP_0, 178 CT_AGC_STEP_0,
175 CT_AGC_STEP_1, 179 CT_AGC_STEP_1,
176 CT_AGC_STEP_2, 180 CT_AGC_STEP_2,
177 CT_AGC_STEP_3, 181 CT_AGC_STEP_3,
178 CT_AGC_STEP_4, 182 CT_AGC_STEP_4,
179 CT_AGC_STOP, 183 CT_AGC_STOP,
180 184
181 CT_DEMOD_START = 30, 185 CT_DEMOD_START = 30,
182 CT_DEMOD_STEP_1, 186 CT_DEMOD_STEP_1,
183 CT_DEMOD_STEP_2, 187 CT_DEMOD_STEP_2,
184 CT_DEMOD_STEP_3, 188 CT_DEMOD_STEP_3,
185 CT_DEMOD_STEP_4, 189 CT_DEMOD_STEP_4,
186 CT_DEMOD_STEP_5, 190 CT_DEMOD_STEP_5,
187 CT_DEMOD_STEP_6, 191 CT_DEMOD_STEP_6,
188 CT_DEMOD_STEP_7, 192 CT_DEMOD_STEP_7,
189 CT_DEMOD_STEP_8, 193 CT_DEMOD_STEP_8,
190 CT_DEMOD_STEP_9, 194 CT_DEMOD_STEP_9,
191 CT_DEMOD_STEP_10, 195 CT_DEMOD_STEP_10,
192 CT_DEMOD_SEARCH_NEXT = 41, 196 CT_DEMOD_SEARCH_NEXT = 41,
193 CT_DEMOD_STEP_LOCKED, 197 CT_DEMOD_STEP_LOCKED,
194 CT_DEMOD_STOP, 198 CT_DEMOD_STOP,
195 199
196 CT_DONE = 100, 200 CT_DONE = 100,
197 CT_SHUTDOWN, 201 CT_SHUTDOWN,
198 202
199}; 203};
200 204
201struct dvb_frontend_parametersContext { 205struct dvb_frontend_parametersContext {
202#define CHANNEL_STATUS_PARAMETERS_UNKNOWN 0x01 206#define CHANNEL_STATUS_PARAMETERS_UNKNOWN 0x01
203#define CHANNEL_STATUS_PARAMETERS_SET 0x02 207#define CHANNEL_STATUS_PARAMETERS_SET 0x02
204 u8 status; 208 u8 status;
205 u32 tune_time_estimation[2]; 209 u32 tune_time_estimation[2];
206 s32 tps_available; 210 s32 tps_available;
207 u16 tps[9]; 211 u16 tps[9];
208}; 212};
209 213
210#define FE_STATUS_TUNE_FAILED 0 214#define FE_STATUS_TUNE_FAILED 0
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-30 17:38:27 -0500