aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/frontends/tda18271-fe.c18
-rw-r--r--drivers/media/dvb/frontends/tda18271-priv.h18
-rw-r--r--drivers/media/dvb/frontends/tda18271-tables.c16
3 files changed, 26 insertions, 26 deletions
diff --git a/drivers/media/dvb/frontends/tda18271-fe.c b/drivers/media/dvb/frontends/tda18271-fe.c
index 4a32c2e63719..4c105853d93c 100644
--- a/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/drivers/media/dvb/frontends/tda18271-fe.c
@@ -386,7 +386,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
386 /* RF tracking filter calibration */ 386 /* RF tracking filter calibration */
387 387
388 /* calculate BP_Filter */ 388 /* calculate BP_Filter */
389 tda18271_calc_bp_filter(&freq, &val); 389 tda18271_lookup_bp_filter(&freq, &val);
390 390
391 regs[R_EP1] &= ~0x07; /* clear bp filter bits */ 391 regs[R_EP1] &= ~0x07; /* clear bp filter bits */
392 regs[R_EP1] |= val; 392 regs[R_EP1] |= val;
@@ -419,7 +419,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
419 break; 419 break;
420 } 420 }
421 421
422 tda18271_calc_cal_pll(&N, &pd, &d); 422 tda18271_lookup_cal_pll(&N, &pd, &d);
423 423
424 regs[R_CPD] = pd; 424 regs[R_CPD] = pd;
425 425
@@ -439,7 +439,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
439 break; 439 break;
440 } 440 }
441 441
442 tda18271_calc_main_pll(&N, &pd, &d); 442 tda18271_lookup_main_pll(&N, &pd, &d);
443 443
444 regs[R_MPD] = (0x7f & pd); 444 regs[R_MPD] = (0x7f & pd);
445 445
@@ -461,20 +461,20 @@ static int tda18271_tune(struct dvb_frontend *fe,
461 msleep(5); /* RF tracking filter calibration initialization */ 461 msleep(5); /* RF tracking filter calibration initialization */
462 462
463 /* search for K,M,CO for RF Calibration */ 463 /* search for K,M,CO for RF Calibration */
464 tda18271_calc_km(&freq, &val); 464 tda18271_lookup_km(&freq, &val);
465 465
466 regs[R_EB13] &= 0x83; 466 regs[R_EB13] &= 0x83;
467 regs[R_EB13] |= val; 467 regs[R_EB13] |= val;
468 tda18271_write_regs(fe, R_EB13, 1); 468 tda18271_write_regs(fe, R_EB13, 1);
469 469
470 /* search for RF_BAND */ 470 /* search for RF_BAND */
471 tda18271_calc_rf_band(&freq, &val); 471 tda18271_lookup_rf_band(&freq, &val);
472 472
473 regs[R_EP2] &= ~0xe0; /* clear rf band bits */ 473 regs[R_EP2] &= ~0xe0; /* clear rf band bits */
474 regs[R_EP2] |= (val << 5); 474 regs[R_EP2] |= (val << 5);
475 475
476 /* search for Gain_Taper */ 476 /* search for Gain_Taper */
477 tda18271_calc_gain_taper(&freq, &val); 477 tda18271_lookup_gain_taper(&freq, &val);
478 478
479 regs[R_EP2] &= ~0x1f; /* clear gain taper bits */ 479 regs[R_EP2] &= ~0x1f; /* clear gain taper bits */
480 regs[R_EP2] |= val; 480 regs[R_EP2] |= val;
@@ -502,7 +502,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
502 tda18271_write_regs(fe, R_EP1, 1); 502 tda18271_write_regs(fe, R_EP1, 1);
503 503
504 /* RF tracking filer correction for VHF_Low band */ 504 /* RF tracking filer correction for VHF_Low band */
505 tda18271_calc_rf_cal(&freq, &val); 505 tda18271_lookup_rf_cal(&freq, &val);
506 506
507 /* VHF_Low band only */ 507 /* VHF_Low band only */
508 if (val != 0) { 508 if (val != 0) {
@@ -546,7 +546,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
546 regs[R_EP4] &= ~0x80; /* turn this bit on only for fm */ 546 regs[R_EP4] &= ~0x80; /* turn this bit on only for fm */
547 547
548 /* image rejection validity EP5[2:0] */ 548 /* image rejection validity EP5[2:0] */
549 tda18271_calc_ir_measure(&freq, &val); 549 tda18271_lookup_ir_measure(&freq, &val);
550 550
551 regs[R_EP5] &= ~0x07; 551 regs[R_EP5] &= ~0x07;
552 regs[R_EP5] |= val; 552 regs[R_EP5] |= val;
@@ -554,7 +554,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
554 /* calculate MAIN PLL */ 554 /* calculate MAIN PLL */
555 N = freq + ifc; 555 N = freq + ifc;
556 556
557 tda18271_calc_main_pll(&N, &pd, &d); 557 tda18271_lookup_main_pll(&N, &pd, &d);
558 558
559 regs[R_MPD] = (0x7f & pd); 559 regs[R_MPD] = (0x7f & pd);
560 switch (priv->mode) { 560 switch (priv->mode) {
diff --git a/drivers/media/dvb/frontends/tda18271-priv.h b/drivers/media/dvb/frontends/tda18271-priv.h
index d56c2fe3efa2..e1fa9a467939 100644
--- a/drivers/media/dvb/frontends/tda18271-priv.h
+++ b/drivers/media/dvb/frontends/tda18271-priv.h
@@ -82,15 +82,15 @@ extern int tda18271_debug;
82 82
83/*---------------------------------------------------------------------*/ 83/*---------------------------------------------------------------------*/
84 84
85extern void tda18271_calc_cal_pll(u32 *freq, u8 *post_div, u8 *div); 85extern void tda18271_lookup_cal_pll(u32 *freq, u8 *post_div, u8 *div);
86extern void tda18271_calc_main_pll(u32 *freq, u8 *post_div, u8 *div); 86extern void tda18271_lookup_main_pll(u32 *freq, u8 *post_div, u8 *div);
87 87
88extern void tda18271_calc_bp_filter(u32 *freq, u8 *val); 88extern void tda18271_lookup_bp_filter(u32 *freq, u8 *val);
89extern void tda18271_calc_km(u32 *freq, u8 *val); 89extern void tda18271_lookup_km(u32 *freq, u8 *val);
90extern void tda18271_calc_rf_band(u32 *freq, u8 *val); 90extern void tda18271_lookup_rf_band(u32 *freq, u8 *val);
91extern void tda18271_calc_gain_taper(u32 *freq, u8 *val); 91extern void tda18271_lookup_gain_taper(u32 *freq, u8 *val);
92extern void tda18271_calc_rf_cal(u32 *freq, u8 *val); 92extern void tda18271_lookup_rf_cal(u32 *freq, u8 *val);
93extern void tda18271_calc_ir_measure(u32 *freq, u8 *val); 93extern void tda18271_lookup_ir_measure(u32 *freq, u8 *val);
94 94
95#endif /* __TDA18271_PRIV_H__ */ 95#endif /* __TDA18271_PRIV_H__ */
96 96
diff --git a/drivers/media/dvb/frontends/tda18271-tables.c b/drivers/media/dvb/frontends/tda18271-tables.c
index 65387bb059eb..cce0e0d82233 100644
--- a/drivers/media/dvb/frontends/tda18271-tables.c
+++ b/drivers/media/dvb/frontends/tda18271-tables.c
@@ -294,49 +294,49 @@ static void tda18271_lookup_pll_map(struct tda18271_pll_map *map,
294 294
295/*---------------------------------------------------------------------*/ 295/*---------------------------------------------------------------------*/
296 296
297void tda18271_calc_cal_pll(u32 *freq, u8 *post_div, u8 *div) 297void tda18271_lookup_cal_pll(u32 *freq, u8 *post_div, u8 *div)
298{ 298{
299 tda18271_lookup_pll_map(tda18271_cal_pll, freq, post_div, div); 299 tda18271_lookup_pll_map(tda18271_cal_pll, freq, post_div, div);
300 dbg_map("post div = 0x%02x, div = 0x%02x\n", *post_div, *div); 300 dbg_map("post div = 0x%02x, div = 0x%02x\n", *post_div, *div);
301} 301}
302 302
303void tda18271_calc_main_pll(u32 *freq, u8 *post_div, u8 *div) 303void tda18271_lookup_main_pll(u32 *freq, u8 *post_div, u8 *div)
304{ 304{
305 tda18271_lookup_pll_map(tda18271_main_pll, freq, post_div, div); 305 tda18271_lookup_pll_map(tda18271_main_pll, freq, post_div, div);
306 dbg_map("post div = 0x%02x, div = 0x%02x\n", *post_div, *div); 306 dbg_map("post div = 0x%02x, div = 0x%02x\n", *post_div, *div);
307} 307}
308 308
309void tda18271_calc_bp_filter(u32 *freq, u8 *val) 309void tda18271_lookup_bp_filter(u32 *freq, u8 *val)
310{ 310{
311 tda18271_lookup_map(tda18271_bp_filter, freq, val); 311 tda18271_lookup_map(tda18271_bp_filter, freq, val);
312 dbg_map("0x%02x\n", *val); 312 dbg_map("0x%02x\n", *val);
313} 313}
314 314
315void tda18271_calc_km(u32 *freq, u8 *val) 315void tda18271_lookup_km(u32 *freq, u8 *val)
316{ 316{
317 tda18271_lookup_map(tda18271_km, freq, val); 317 tda18271_lookup_map(tda18271_km, freq, val);
318 dbg_map("0x%02x\n", *val); 318 dbg_map("0x%02x\n", *val);
319} 319}
320 320
321void tda18271_calc_rf_band(u32 *freq, u8 *val) 321void tda18271_lookup_rf_band(u32 *freq, u8 *val)
322{ 322{
323 tda18271_lookup_map(tda18271_rf_band, freq, val); 323 tda18271_lookup_map(tda18271_rf_band, freq, val);
324 dbg_map("0x%02x\n", *val); 324 dbg_map("0x%02x\n", *val);
325} 325}
326 326
327void tda18271_calc_gain_taper(u32 *freq, u8 *val) 327void tda18271_lookup_gain_taper(u32 *freq, u8 *val)
328{ 328{
329 tda18271_lookup_map(tda18271_gain_taper, freq, val); 329 tda18271_lookup_map(tda18271_gain_taper, freq, val);
330 dbg_map("0x%02x\n", *val); 330 dbg_map("0x%02x\n", *val);
331} 331}
332 332
333void tda18271_calc_rf_cal(u32 *freq, u8 *val) 333void tda18271_lookup_rf_cal(u32 *freq, u8 *val)
334{ 334{
335 tda18271_lookup_map(tda18271_rf_cal, freq, val); 335 tda18271_lookup_map(tda18271_rf_cal, freq, val);
336 dbg_map("0x%02x\n", *val); 336 dbg_map("0x%02x\n", *val);
337} 337}
338 338
339void tda18271_calc_ir_measure(u32 *freq, u8 *val) 339void tda18271_lookup_ir_measure(u32 *freq, u8 *val)
340{ 340{
341 tda18271_lookup_map(tda18271_ir_measure, freq, val); 341 tda18271_lookup_map(tda18271_ir_measure, freq, val);
342 dbg_map("0x%02x\n", *val); 342 dbg_map("0x%02x\n", *val);