From ced1d23fa8a82327ba6c2a68c9874ecb59f07cd9 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 2 Dec 2007 11:03:57 -0300
Subject: [PATCH] --- yaml --- r: 76524 b: refs/heads/master c:
 aaeccba68a60eedee5fe90f9e1478367b1f97345 h: refs/heads/master v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/media/dvb/frontends/tda18271-fe.c     | 11 ++++++++++-
 trunk/drivers/media/dvb/frontends/tda18271-priv.h   |  1 +
 trunk/drivers/media/dvb/frontends/tda18271-tables.c |  8 ++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d380c1b8071..3b0613e68858 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 293da0ec468addf891856e9ffee88af2fd00e25a
+refs/heads/master: aaeccba68a60eedee5fe90f9e1478367b1f97345
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-fe.c b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
index 01de75e369ed..fee38c1657e1 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
@@ -578,7 +578,16 @@ static int tda18271_tune(struct dvb_frontend *fe,
 
 	regs[R_EP4]  &= ~0x80; /* turn this bit on only for fm */
 
-	/* FIXME: image rejection validity EP5[2:0] */
+	/* image rejection validity EP5[2:0] */
+	i = 0;
+	while ((tda18271_ir_measure[i].rfmax * 1000) < freq) {
+		if (tda18271_ir_measure[i].rfmax == 0)
+			break;
+		i++;
+	}
+	dbg_map("ir measure, i = %d\n", i);
+	regs[R_EP5] &= ~0x07;
+	regs[R_EP5] |= tda18271_ir_measure[i].val;
 
 	/* calculate MAIN PLL */
 	N = freq + ifc;
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-priv.h b/trunk/drivers/media/dvb/frontends/tda18271-priv.h
index 71b4d7963699..a3158eb25594 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-priv.h
+++ b/trunk/drivers/media/dvb/frontends/tda18271-priv.h
@@ -84,6 +84,7 @@ extern struct tda18271_map tda18271_km[];
 extern struct tda18271_map tda18271_rf_band[];
 extern struct tda18271_map tda18271_gain_taper[];
 extern struct tda18271_map tda18271_rf_cal[];
+extern struct tda18271_map tda18271_ir_measure[];
 
 #endif /* __TDA18271_PRIV_H__ */
 
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-tables.c b/trunk/drivers/media/dvb/frontends/tda18271-tables.c
index a018b5140873..d65d3411e362 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-tables.c
+++ b/trunk/drivers/media/dvb/frontends/tda18271-tables.c
@@ -244,6 +244,14 @@ struct tda18271_map tda18271_rf_cal[] = {
 	{ .rfmax =     0, .val = 0x00 }, /* end */
 };
 
+struct tda18271_map tda18271_ir_measure[] = {
+	{ .rfmax =  30000, .val = 4},
+	{ .rfmax = 200000, .val = 5},
+	{ .rfmax = 600000, .val = 6},
+	{ .rfmax = 865000, .val = 7},
+	{ .rfmax =      0, .val = 0}, /* end */
+};
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------