V4L/DVB (6435): tda8290: add support for NXP TDA18271 tuner and TDA8295 analog demod

Add basic support for NXP TDA8295 analog demod and TDA18271 tuner silicon.

TDA8295 + TDA8275a not yet tested.
TDA8290 + TDA18271 not yet supported.

Digital mode of TDA18271 not yet tested & needs more work.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

10 files changed, 1434 insertions, 8 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index d363d0cae38b..e52229380984 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -105,9 +105,10 @@ config TUNER_MT20XX
           Say Y here to include support for the MT2032 / MT2050 tuner.
 
 config TUNER_TDA8290
-        tristate "TDA 8290+8275(a) tuner combo"
+        tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"
         depends on I2C
         select DVB_TDA827X
+        select DVB_TDA18271
         default m if VIDEO_TUNER_CUSTOMIZE
         help
           Say Y here to include support for Philips TDA8290+8275(a) tuner.
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 59b9ed1f1aec..57178d6e1cf8 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -316,6 +316,13 @@ config DVB_TDA827X
         help
           A DVB-T silicon tuner module. Say Y when you want to support this tuner.
 
+config DVB_TDA18271
+        tristate "NXP TDA18271 silicon tuner"
+        depends on I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A silicon tuner module. Say Y when you want to support this tuner.
+
 config DVB_TUNER_QT1010
         tristate "Quantek QT1010 silicon tuner"
         depends on DVB_CORE && I2C
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 4b8ad1f132aa..457effcda5da 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_DVB_ISL6421) += isl6421.o
 obj-$(CONFIG_DVB_TDA10086) += tda10086.o
 obj-$(CONFIG_DVB_TDA826X) += tda826x.o
 obj-$(CONFIG_DVB_TDA827X) += tda827x.o
+obj-$(CONFIG_DVB_TDA18271) += tda18271.o
 obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o
 obj-$(CONFIG_DVB_TUNER_MT2266) += mt2266.o
 obj-$(CONFIG_DVB_TUNER_DIB0070) += dib0070.o
diff --git a/drivers/media/dvb/frontends/tda18271.c b/drivers/media/dvb/frontends/tda18271.c
new file mode 100644
index 000000000000..3395f2bda498
--- /dev/null
+++ b/drivers/media/dvb/frontends/tda18271.c
@@ -0,0 +1,1054 @@
+/*
+    tda18271.c - driver for the Philips / NXP TDA18271 silicon tuner
+
+    Copyright (C) 2007 Michael Krufky (mkrufky@linuxtv.org)
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/videodev2.h>
+
+#include "tda18271.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+
+#define tuner_dbg(fmt, arg...) do {\
+        if (debug > 0) \
+                printk(KERN_DEBUG fmt, ##arg); } while (0)
+
+#define tuner_extra_dbg(fmt, arg...) do {\
+        if (debug > 1) \
+                printk(KERN_DEBUG fmt, ##arg); } while (0)
+
+#define R_ID     0x00   /* ID byte                */
+#define R_TM     0x01   /* Thermo byte            */
+#define R_PL     0x02   /* Power level byte       */
+#define R_EP1    0x03   /* Easy Prog byte 1       */
+#define R_EP2    0x04   /* Easy Prog byte 2       */
+#define R_EP3    0x05   /* Easy Prog byte 3       */
+#define R_EP4    0x06   /* Easy Prog byte 4       */
+#define R_EP5    0x07   /* Easy Prog byte 5       */
+#define R_CPD    0x08   /* Cal Post-Divider byte  */
+#define R_CD1    0x09   /* Cal Divider byte 1     */
+#define R_CD2    0x0a   /* Cal Divider byte 2     */
+#define R_CD3    0x0b   /* Cal Divider byte 3     */
+#define R_MPD    0x0c   /* Main Post-Divider byte */
+#define R_MD1    0x0d   /* Main Divider byte 1    */
+#define R_MD2    0x0e   /* Main Divider byte 2    */
+#define R_MD3    0x0f   /* Main Divider byte 3    */
+#define R_EB1    0x10   /* Extended byte 1        */
+#define R_EB2    0x11   /* Extended byte 2        */
+#define R_EB3    0x12   /* Extended byte 3        */
+#define R_EB4    0x13   /* Extended byte 4        */
+#define R_EB5    0x14   /* Extended byte 5        */
+#define R_EB6    0x15   /* Extended byte 6        */
+#define R_EB7    0x16   /* Extended byte 7        */
+#define R_EB8    0x17   /* Extended byte 8        */
+#define R_EB9    0x18   /* Extended byte 9        */
+#define R_EB10   0x19   /* Extended byte 10       */
+#define R_EB11   0x1a   /* Extended byte 11       */
+#define R_EB12   0x1b   /* Extended byte 12       */
+#define R_EB13   0x1c   /* Extended byte 13       */
+#define R_EB14   0x1d   /* Extended byte 14       */
+#define R_EB15   0x1e   /* Extended byte 15       */
+#define R_EB16   0x1f   /* Extended byte 16       */
+#define R_EB17   0x20   /* Extended byte 17       */
+#define R_EB18   0x21   /* Extended byte 18       */
+#define R_EB19   0x22   /* Extended byte 19       */
+#define R_EB20   0x23   /* Extended byte 20       */
+#define R_EB21   0x24   /* Extended byte 21       */
+#define R_EB22   0x25   /* Extended byte 22       */
+#define R_EB23   0x26   /* Extended byte 23       */
+
+struct tda18271_pll_map {
+        u32 lomax;
+        u8 pd; /* post div */
+        u8 d;  /*      div */
+};
+
+static struct tda18271_pll_map tda18271_main_pll[] = {
+        { .lomax =  32000, .pd = 0x5f, .d = 0xf0 },
+        { .lomax =  35000, .pd = 0x5e, .d = 0xe0 },
+        { .lomax =  37000, .pd = 0x5d, .d = 0xd0 },
+        { .lomax =  41000, .pd = 0x5c, .d = 0xc0 },
+        { .lomax =  44000, .pd = 0x5b, .d = 0xb0 },
+        { .lomax =  49000, .pd = 0x5a, .d = 0xa0 },
+        { .lomax =  54000, .pd = 0x59, .d = 0x90 },
+        { .lomax =  61000, .pd = 0x58, .d = 0x80 },
+        { .lomax =  65000, .pd = 0x4f, .d = 0x78 },
+        { .lomax =  70000, .pd = 0x4e, .d = 0x70 },
+        { .lomax =  75000, .pd = 0x4d, .d = 0x68 },
+        { .lomax =  82000, .pd = 0x4c, .d = 0x60 },
+        { .lomax =  89000, .pd = 0x4b, .d = 0x58 },
+        { .lomax =  98000, .pd = 0x4a, .d = 0x50 },
+        { .lomax = 109000, .pd = 0x49, .d = 0x48 },
+        { .lomax = 123000, .pd = 0x48, .d = 0x40 },
+        { .lomax = 131000, .pd = 0x3f, .d = 0x3c },
+        { .lomax = 141000, .pd = 0x3e, .d = 0x38 },
+        { .lomax = 151000, .pd = 0x3d, .d = 0x34 },
+        { .lomax = 164000, .pd = 0x3c, .d = 0x30 },
+        { .lomax = 179000, .pd = 0x3b, .d = 0x2c },
+        { .lomax = 197000, .pd = 0x3a, .d = 0x28 },
+        { .lomax = 219000, .pd = 0x39, .d = 0x24 },
+        { .lomax = 246000, .pd = 0x38, .d = 0x20 },
+        { .lomax = 263000, .pd = 0x2f, .d = 0x1e },
+        { .lomax = 282000, .pd = 0x2e, .d = 0x1c },
+        { .lomax = 303000, .pd = 0x2d, .d = 0x1a },
+        { .lomax = 329000, .pd = 0x2c, .d = 0x18 },
+        { .lomax = 359000, .pd = 0x2b, .d = 0x16 },
+        { .lomax = 395000, .pd = 0x2a, .d = 0x14 },
+        { .lomax = 438000, .pd = 0x29, .d = 0x12 },
+        { .lomax = 493000, .pd = 0x28, .d = 0x10 },
+        { .lomax = 526000, .pd = 0x1f, .d = 0x0f },
+        { .lomax = 564000, .pd = 0x1e, .d = 0x0e },
+        { .lomax = 607000, .pd = 0x1d, .d = 0x0d },
+        { .lomax = 658000, .pd = 0x1c, .d = 0x0c },
+        { .lomax = 718000, .pd = 0x1b, .d = 0x0b },
+        { .lomax = 790000, .pd = 0x1a, .d = 0x0a },
+        { .lomax = 877000, .pd = 0x19, .d = 0x09 },
+        { .lomax = 987000, .pd = 0x18, .d = 0x08 },
+        { .lomax =      0, .pd = 0x00, .d = 0x00 }, /* end */
+};
+
+static struct tda18271_pll_map tda18271_cal_pll[] = {
+        { .lomax =   33000, .pd = 0xdd, .d = 0xd0 },
+        { .lomax =   36000, .pd = 0xdc, .d = 0xc0 },
+        { .lomax =   40000, .pd = 0xdb, .d = 0xb0 },
+        { .lomax =   44000, .pd = 0xda, .d = 0xa0 },
+        { .lomax =   49000, .pd = 0xd9, .d = 0x90 },
+        { .lomax =   55000, .pd = 0xd8, .d = 0x80 },
+        { .lomax =   63000, .pd = 0xd3, .d = 0x70 },
+        { .lomax =   67000, .pd = 0xcd, .d = 0x68 },
+        { .lomax =   73000, .pd = 0xcc, .d = 0x60 },
+        { .lomax =   80000, .pd = 0xcb, .d = 0x58 },
+        { .lomax =   88000, .pd = 0xca, .d = 0x50 },
+        { .lomax =   98000, .pd = 0xc9, .d = 0x48 },
+        { .lomax =  110000, .pd = 0xc8, .d = 0x40 },
+        { .lomax =  126000, .pd = 0xc3, .d = 0x38 },
+        { .lomax =  135000, .pd = 0xbd, .d = 0x34 },
+        { .lomax =  147000, .pd = 0xbc, .d = 0x30 },
+        { .lomax =  160000, .pd = 0xbb, .d = 0x2c },
+        { .lomax =  176000, .pd = 0xba, .d = 0x28 },
+        { .lomax =  196000, .pd = 0xb9, .d = 0x24 },
+        { .lomax =  220000, .pd = 0xb8, .d = 0x20 },
+        { .lomax =  252000, .pd = 0xb3, .d = 0x1c },
+        { .lomax =  271000, .pd = 0xad, .d = 0x1a },
+        { .lomax =  294000, .pd = 0xac, .d = 0x18 },
+        { .lomax =  321000, .pd = 0xab, .d = 0x16 },
+        { .lomax =  353000, .pd = 0xaa, .d = 0x14 },
+        { .lomax =  392000, .pd = 0xa9, .d = 0x12 },
+        { .lomax =  441000, .pd = 0xa8, .d = 0x10 },
+        { .lomax =  505000, .pd = 0xa3, .d = 0x0e },
+        { .lomax =  543000, .pd = 0x9d, .d = 0x0d },
+        { .lomax =  589000, .pd = 0x9c, .d = 0x0c },
+        { .lomax =  642000, .pd = 0x9b, .d = 0x0b },
+        { .lomax =  707000, .pd = 0x9a, .d = 0x0a },
+        { .lomax =  785000, .pd = 0x99, .d = 0x09 },
+        { .lomax =  883000, .pd = 0x98, .d = 0x08 },
+        { .lomax = 1010000, .pd = 0x93, .d = 0x07 },
+        { .lomax =       0, .pd = 0x00, .d = 0x00 }, /* end */
+};
+
+struct tda18271_map {
+        u32 rfmax;
+        u8  val;
+};
+
+static struct tda18271_map tda18271_bp_filter[] = {
+        { .rfmax =  62000, .val = 0x00 },
+        { .rfmax =  84000, .val = 0x01 },
+        { .rfmax = 100000, .val = 0x02 },
+        { .rfmax = 140000, .val = 0x03 },
+        { .rfmax = 170000, .val = 0x04 },
+        { .rfmax = 180000, .val = 0x05 },
+        { .rfmax = 865000, .val = 0x06 },
+        { .rfmax =      0, .val = 0x00 }, /* end */
+};
+
+static struct tda18271_map tda18271_km[] = {
+        { .rfmax =  61100, .val = 0x74 },
+        { .rfmax = 350000, .val = 0x40 },
+        { .rfmax = 720000, .val = 0x30 },
+        { .rfmax = 865000, .val = 0x40 },
+        { .rfmax =      0, .val = 0x00 }, /* end */
+};
+
+static struct tda18271_map tda18271_rf_band[] = {
+        { .rfmax =  47900, .val = 0x00 },
+        { .rfmax =  61100, .val = 0x01 },
+/*      { .rfmax = 152600, .val = 0x02 }, */
+        { .rfmax = 121200, .val = 0x02 },
+        { .rfmax = 164700, .val = 0x03 },
+        { .rfmax = 203500, .val = 0x04 },
+        { .rfmax = 457800, .val = 0x05 },
+        { .rfmax = 865000, .val = 0x06 },
+        { .rfmax =      0, .val = 0x00 }, /* end */
+};
+
+static struct tda18271_map tda18271_gain_taper[] = {
+        { .rfmax =  45400, .val = 0x1f },
+        { .rfmax =  45800, .val = 0x1e },
+        { .rfmax =  46200, .val = 0x1d },
+        { .rfmax =  46700, .val = 0x1c },
+        { .rfmax =  47100, .val = 0x1b },
+        { .rfmax =  47500, .val = 0x1a },
+        { .rfmax =  47900, .val = 0x19 },
+        { .rfmax =  49600, .val = 0x17 },
+        { .rfmax =  51200, .val = 0x16 },
+        { .rfmax =  52900, .val = 0x15 },
+        { .rfmax =  54500, .val = 0x14 },
+        { .rfmax =  56200, .val = 0x13 },
+        { .rfmax =  57800, .val = 0x12 },
+        { .rfmax =  59500, .val = 0x11 },
+        { .rfmax =  61100, .val = 0x10 },
+        { .rfmax =  67600, .val = 0x0d },
+        { .rfmax =  74200, .val = 0x0c },
+        { .rfmax =  80700, .val = 0x0b },
+        { .rfmax =  87200, .val = 0x0a },
+        { .rfmax =  93800, .val = 0x09 },
+        { .rfmax = 100300, .val = 0x08 },
+        { .rfmax = 106900, .val = 0x07 },
+        { .rfmax = 113400, .val = 0x06 },
+        { .rfmax = 119900, .val = 0x05 },
+        { .rfmax = 126500, .val = 0x04 },
+        { .rfmax = 133000, .val = 0x03 },
+        { .rfmax = 139500, .val = 0x02 },
+        { .rfmax = 146100, .val = 0x01 },
+        { .rfmax = 152600, .val = 0x00 },
+        { .rfmax = 154300, .val = 0x1f },
+        { .rfmax = 156100, .val = 0x1e },
+        { .rfmax = 157800, .val = 0x1d },
+        { .rfmax = 159500, .val = 0x1c },
+        { .rfmax = 161200, .val = 0x1b },
+        { .rfmax = 163000, .val = 0x1a },
+        { .rfmax = 164700, .val = 0x19 },
+        { .rfmax = 170200, .val = 0x17 },
+        { .rfmax = 175800, .val = 0x16 },
+        { .rfmax = 181300, .val = 0x15 },
+        { .rfmax = 186900, .val = 0x14 },
+        { .rfmax = 192400, .val = 0x13 },
+        { .rfmax = 198000, .val = 0x12 },
+        { .rfmax = 203500, .val = 0x11 },
+        { .rfmax = 216200, .val = 0x14 },
+        { .rfmax = 228900, .val = 0x13 },
+        { .rfmax = 241600, .val = 0x12 },
+        { .rfmax = 254400, .val = 0x11 },
+        { .rfmax = 267100, .val = 0x10 },
+        { .rfmax = 279800, .val = 0x0f },
+        { .rfmax = 292500, .val = 0x0e },
+        { .rfmax = 305200, .val = 0x0d },
+        { .rfmax = 317900, .val = 0x0c },
+        { .rfmax = 330700, .val = 0x0b },
+        { .rfmax = 343400, .val = 0x0a },
+        { .rfmax = 356100, .val = 0x09 },
+        { .rfmax = 368800, .val = 0x08 },
+        { .rfmax = 381500, .val = 0x07 },
+        { .rfmax = 394200, .val = 0x06 },
+        { .rfmax = 406900, .val = 0x05 },
+        { .rfmax = 419700, .val = 0x04 },
+        { .rfmax = 432400, .val = 0x03 },
+        { .rfmax = 445100, .val = 0x02 },
+        { .rfmax = 457800, .val = 0x01 },
+        { .rfmax = 476300, .val = 0x19 },
+        { .rfmax = 494800, .val = 0x18 },
+        { .rfmax = 513300, .val = 0x17 },
+        { .rfmax = 531800, .val = 0x16 },
+        { .rfmax = 550300, .val = 0x15 },
+        { .rfmax = 568900, .val = 0x14 },
+        { .rfmax = 587400, .val = 0x13 },
+        { .rfmax = 605900, .val = 0x12 },
+        { .rfmax = 624400, .val = 0x11 },
+        { .rfmax = 642900, .val = 0x10 },
+        { .rfmax = 661400, .val = 0x0f },
+        { .rfmax = 679900, .val = 0x0e },
+        { .rfmax = 698400, .val = 0x0d },
+        { .rfmax = 716900, .val = 0x0c },
+        { .rfmax = 735400, .val = 0x0b },
+        { .rfmax = 753900, .val = 0x0a },
+        { .rfmax = 772500, .val = 0x09 },
+        { .rfmax = 791000, .val = 0x08 },
+        { .rfmax = 809500, .val = 0x07 },
+        { .rfmax = 828000, .val = 0x06 },
+        { .rfmax = 846500, .val = 0x05 },
+        { .rfmax = 865000, .val = 0x04 },
+        { .rfmax =      0, .val = 0x00 }, /* end */
+};
+
+static struct tda18271_map tda18271_rf_cal[] = {
+        { .rfmax = 41000, .val = 0x1e },
+        { .rfmax = 43000, .val = 0x30 },
+        { .rfmax = 45000, .val = 0x43 },
+        { .rfmax = 46000, .val = 0x4d },
+        { .rfmax = 47000, .val = 0x54 },
+        { .rfmax = 47900, .val = 0x64 },
+        { .rfmax = 49100, .val = 0x20 },
+        { .rfmax = 50000, .val = 0x22 },
+        { .rfmax = 51000, .val = 0x2a },
+        { .rfmax = 53000, .val = 0x32 },
+        { .rfmax = 55000, .val = 0x35 },
+        { .rfmax = 56000, .val = 0x3c },
+        { .rfmax = 57000, .val = 0x3f },
+        { .rfmax = 58000, .val = 0x48 },
+        { .rfmax = 59000, .val = 0x4d },
+        { .rfmax = 60000, .val = 0x58 },
+        { .rfmax = 61100, .val = 0x5f },
+        { .rfmax =     0, .val = 0x00 }, /* end */
+};
+
+/*---------------------------------------------------------------------*/
+
+#define TDA18271_NUM_REGS 39
+
+#define TDA18271_ANALOG  0
+#define TDA18271_DIGITAL 1
+
+struct tda18271_priv {
+        u8 i2c_addr;
+        struct i2c_adapter *i2c_adap;
+        unsigned char tda18271_regs[TDA18271_NUM_REGS];
+        int mode;
+
+        u32 frequency;
+        u32 bandwidth;
+};
+
+/*---------------------------------------------------------------------*/
+
+static void tda18271_dump_regs(struct dvb_frontend *fe)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        unsigned char *regs = priv->tda18271_regs;
+
+        tuner_dbg("=== TDA18271 REG DUMP ===\n");
+        tuner_dbg("ID_BYTE            = 0x%x\n", 0xff & regs[R_ID]);
+        tuner_dbg("THERMO_BYTE        = 0x%x\n", 0xff & regs[R_TM]);
+        tuner_dbg("POWER_LEVEL_BYTE   = 0x%x\n", 0xff & regs[R_PL]);
+        tuner_dbg("EASY_PROG_BYTE_1   = 0x%x\n", 0xff & regs[R_EP1]);
+        tuner_dbg("EASY_PROG_BYTE_2   = 0x%x\n", 0xff & regs[R_EP2]);
+        tuner_dbg("EASY_PROG_BYTE_3   = 0x%x\n", 0xff & regs[R_EP3]);
+        tuner_dbg("EASY_PROG_BYTE_4   = 0x%x\n", 0xff & regs[R_EP4]);
+        tuner_dbg("EASY_PROG_BYTE_5   = 0x%x\n", 0xff & regs[R_EP5]);
+        tuner_dbg("CAL_POST_DIV_BYTE  = 0x%x\n", 0xff & regs[R_CPD]);
+        tuner_dbg("CAL_DIV_BYTE_1     = 0x%x\n", 0xff & regs[R_CD1]);
+        tuner_dbg("CAL_DIV_BYTE_2     = 0x%x\n", 0xff & regs[R_CD2]);
+        tuner_dbg("CAL_DIV_BYTE_3     = 0x%x\n", 0xff & regs[R_CD3]);
+        tuner_dbg("MAIN_POST_DIV_BYTE = 0x%x\n", 0xff & regs[R_MPD]);
+        tuner_dbg("MAIN_DIV_BYTE_1    = 0x%x\n", 0xff & regs[R_MD1]);
+        tuner_dbg("MAIN_DIV_BYTE_2    = 0x%x\n", 0xff & regs[R_MD2]);
+        tuner_dbg("MAIN_DIV_BYTE_3    = 0x%x\n", 0xff & regs[R_MD3]);
+}
+
+static void tda18271_read_regs(struct dvb_frontend *fe)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        unsigned char *regs = priv->tda18271_regs;
+        unsigned char buf = 0x00;
+        int ret;
+        struct i2c_msg msg[] = {
+                { .addr = priv->i2c_addr, .flags = 0,
+                  .buf = &buf, .len = 1 },
+                { .addr = priv->i2c_addr, .flags = I2C_M_RD,
+                  .buf = regs, .len = 16 }
+        };
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        /* read all registers */
+        ret = i2c_transfer(priv->i2c_adap, msg, 2);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        if (ret != 2)
+                printk("ERROR: %s: i2c_transfer returned: %d\n",
+                       __FUNCTION__, ret);
+
+        if (debug > 1)
+                tda18271_dump_regs(fe);
+}
+
+static void tda18271_write_regs(struct dvb_frontend *fe, int idx, int len)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        unsigned char *regs = priv->tda18271_regs;
+        unsigned char buf[TDA18271_NUM_REGS+1];
+        struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
+                               .buf = buf, .len = len+1 };
+        int i, ret;
+
+        BUG_ON((len == 0) || (idx+len > sizeof(buf)));
+
+        buf[0] = idx;
+        for (i = 1; i <= len; i++) {
+                buf[i] = regs[idx-1+i];
+        }
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        /* write registers */
+        ret = i2c_transfer(priv->i2c_adap, &msg, 1);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        if (ret != 1)
+                printk(KERN_WARNING "ERROR: %s: i2c_transfer returned: %d\n",
+                       __FUNCTION__, ret);
+}
+
+/*---------------------------------------------------------------------*/
+
+static void tda18271_init_regs(struct dvb_frontend *fe)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        unsigned char *regs = priv->tda18271_regs;
+
+        tda18271_read_regs(fe);
+
+        /* test IR_CAL_OK to see if we need init */
+        if ((regs[R_EP1] & 0x08) != 0)
+                return;
+
+        printk(KERN_INFO "tda18271: initializing registers\n");
+
+        /* initialize registers */
+        regs[R_ID]   = 0x83;
+        regs[R_TM]   = 0x08;
+        regs[R_PL]   = 0x80;
+        regs[R_EP1]  = 0xc6;
+        regs[R_EP2]  = 0xdf;
+        regs[R_EP3]  = 0x16;
+        regs[R_EP4]  = 0x60;
+        regs[R_EP5]  = 0x80;
+        regs[R_CPD]  = 0x80;
+        regs[R_CD1]  = 0x00;
+        regs[R_CD2]  = 0x00;
+        regs[R_CD3]  = 0x00;
+        regs[R_MPD]  = 0x00;
+        regs[R_MD1]  = 0x00;
+        regs[R_MD2]  = 0x00;
+        regs[R_MD3]  = 0x00;
+        regs[R_EB1]  = 0xff;
+        regs[R_EB2]  = 0x01;
+        regs[R_EB3]  = 0x84;
+        regs[R_EB4]  = 0x41;
+        regs[R_EB5]  = 0x01;
+        regs[R_EB6]  = 0x84;
+        regs[R_EB7]  = 0x40;
+        regs[R_EB8]  = 0x07;
+        regs[R_EB9]  = 0x00;
+        regs[R_EB10] = 0x00;
+        regs[R_EB11] = 0x96;
+        regs[R_EB12] = 0x0f;
+        regs[R_EB13] = 0xc1;
+        regs[R_EB14] = 0x00;
+        regs[R_EB15] = 0x8f;
+        regs[R_EB16] = 0x00;
+        regs[R_EB17] = 0x00;
+        regs[R_EB18] = 0x00;
+        regs[R_EB19] = 0x00;
+        regs[R_EB20] = 0x20;
+        regs[R_EB21] = 0x33;
+        regs[R_EB22] = 0x48;
+        regs[R_EB23] = 0xb0;
+
+        tda18271_write_regs(fe, 0x00, TDA18271_NUM_REGS);
+        /* setup AGC1 & AGC2 */
+        regs[R_EB17] = 0x00;
+        tda18271_write_regs(fe, R_EB17, 1);
+        regs[R_EB17] = 0x03;
+        tda18271_write_regs(fe, R_EB17, 1);
+        regs[R_EB17] = 0x43;
+        tda18271_write_regs(fe, R_EB17, 1);
+        regs[R_EB17] = 0x4c;
+        tda18271_write_regs(fe, R_EB17, 1);
+
+        regs[R_EB20] = 0xa0;
+        tda18271_write_regs(fe, R_EB20, 1);
+        regs[R_EB20] = 0xa7;
+        tda18271_write_regs(fe, R_EB20, 1);
+        regs[R_EB20] = 0xe7;
+        tda18271_write_regs(fe, R_EB20, 1);
+        regs[R_EB20] = 0xec;
+        tda18271_write_regs(fe, R_EB20, 1);
+
+        /* image rejection calibration */
+
+        /* low-band */
+        regs[R_EP3] = 0x1f;
+        regs[R_EP4] = 0x66;
+        regs[R_EP5] = 0x81;
+        regs[R_CPD] = 0xcc;
+        regs[R_CD1] = 0x6c;
+        regs[R_CD2] = 0x00;
+        regs[R_CD3] = 0x00;
+        regs[R_MPD] = 0xcd;
+        regs[R_MD1] = 0x77;
+        regs[R_MD2] = 0x08;
+        regs[R_MD3] = 0x00;
+
+        tda18271_write_regs(fe, R_EP3, 11);
+        msleep(5); /* pll locking */
+
+        regs[R_EP1] = 0xc6;
+        tda18271_write_regs(fe, R_EP1, 1);
+        msleep(5); /* wanted low measurement */
+
+        regs[R_EP3] = 0x1f;
+        regs[R_EP4] = 0x66;
+        regs[R_EP5] = 0x85;
+        regs[R_CPD] = 0xcb;
+        regs[R_CD1] = 0x66;
+        regs[R_CD2] = 0x70;
+        regs[R_CD3] = 0x00;
+
+        tda18271_write_regs(fe, R_EP3, 7);
+        msleep(5); /* pll locking */
+
+        regs[R_EP2] = 0xdf;
+        tda18271_write_regs(fe, R_EP2, 1);
+        msleep(30); /* image low optimization completion */
+
+        /* mid-band */
+        regs[R_EP3] = 0x1f;
+        regs[R_EP4] = 0x66;
+        regs[R_EP5] = 0x82;
+        regs[R_CPD] = 0xa8;
+        regs[R_CD1] = 0x66;
+        regs[R_CD2] = 0x00;
+        regs[R_CD3] = 0x00;
+        regs[R_MPD] = 0xa9;
+        regs[R_MD1] = 0x73;
+        regs[R_MD2] = 0x1a;
+        regs[R_MD3] = 0x00;
+
+        tda18271_write_regs(fe, R_EP3, 11);
+        msleep(5); /* pll locking */
+
+        regs[R_EP1] = 0xc6;
+        tda18271_write_regs(fe, R_EP1, 1);
+        msleep(5); /* wanted mid measurement */
+
+        regs[R_EP3] = 0x1f;
+        regs[R_EP4] = 0x66;
+        regs[R_EP5] = 0x86;
+        regs[R_CPD] = 0xa8;
+        regs[R_CD1] = 0x66;
+        regs[R_CD2] = 0xa0;
+        regs[R_CD3] = 0x00;
+
+        tda18271_write_regs(fe, R_EP3, 7);
+        msleep(5); /* pll locking */
+
+        regs[R_EP2] = 0xdf;
+        tda18271_write_regs(fe, R_EP2, 1);
+        msleep(30); /* image mid optimization completion */
+
+        /* high-band */
+        regs[R_EP3] = 0x1f;
+        regs[R_EP4] = 0x66;
+        regs[R_EP5] = 0x83;
+        regs[R_CPD] = 0x98;
+        regs[R_CD1] = 0x65;
+        regs[R_CD2] = 0x00;
+        regs[R_CD3] = 0x00;
+        regs[R_MPD] = 0x99;
+        regs[R_MD1] = 0x71;
+        regs[R_MD2] = 0xcd;
+        regs[R_MD3] = 0x00;
+
+        tda18271_write_regs(fe, R_EP3, 11);
+        msleep(5); /* pll locking */
+
+        regs[R_EP1] = 0xc6;
+        tda18271_write_regs(fe, R_EP1, 1);
+        msleep(5); /* wanted high measurement */
+
+        regs[R_EP3] = 0x1f;
+        regs[R_EP4] = 0x66;
+        regs[R_EP5] = 0x87;
+        regs[R_CPD] = 0x98;
+        regs[R_CD1] = 0x65;
+        regs[R_CD2] = 0x50;
+        regs[R_CD3] = 0x00;
+
+        tda18271_write_regs(fe, R_EP3, 7);
+        msleep(5); /* pll locking */
+
+        regs[R_EP2] = 0xdf;
+
+        tda18271_write_regs(fe, R_EP2, 1);
+        msleep(30); /* image high optimization completion */
+
+        regs[R_EP4] = 0x64;
+        tda18271_write_regs(fe, R_EP4, 1);
+
+        regs[R_EP1] = 0xc6;
+        tda18271_write_regs(fe, R_EP1, 1);
+}
+
+static int tda18271_tune(struct dvb_frontend *fe,
+                         u32 ifc, u32 freq, u32 bw, u8 std)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        unsigned char *regs = priv->tda18271_regs;
+        u32 div, N = 0;
+        int i;
+
+
+        tuner_dbg("%s: freq = %d, ifc = %d\n", __FUNCTION__, freq, ifc);
+
+        tda18271_init_regs(fe);
+        /* RF tracking filter calibration */
+
+        /* calculate BP_Filter */
+        i = 0;
+        while ((tda18271_bp_filter[i].rfmax * 1000) < freq) {
+                if (tda18271_bp_filter[i + 1].rfmax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("bp filter = 0x%x, i = %d\n",
+                        tda18271_bp_filter[i].val, i);
+
+        regs[R_EP1]  &= ~0x07; /* clear bp filter bits */
+        regs[R_EP1]  |= tda18271_bp_filter[i].val;
+        tda18271_write_regs(fe, R_EP1, 1);
+
+        regs[R_EB4]  &= 0x07;
+        regs[R_EB4]  |= 0x60;
+        tda18271_write_regs(fe, R_EB4, 1);
+
+        regs[R_EB7]   = 0x60;
+        tda18271_write_regs(fe, R_EB7, 1);
+
+        regs[R_EB14]  = 0x00;
+        tda18271_write_regs(fe, R_EB14, 1);
+
+        regs[R_EB20]  = 0xcc;
+        tda18271_write_regs(fe, R_EB20, 1);
+
+        /* set CAL mode to RF tracking filter calibration */
+        regs[R_EB4]  |= 0x03;
+
+        /* calculate CAL PLL */
+
+        switch (priv->mode) {
+        case TDA18271_ANALOG:
+                N = freq - 1250000;
+                break;
+        case TDA18271_DIGITAL:
+                N = freq + bw / 2;
+                break;
+        }
+
+        i = 0;
+        while ((tda18271_cal_pll[i].lomax * 1000) < N) {
+                if (tda18271_cal_pll[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("cal pll, pd = 0x%x, d = 0x%x, i = %d\n",
+                        tda18271_cal_pll[i].pd, tda18271_cal_pll[i].d, i);
+
+        regs[R_CPD]   = tda18271_cal_pll[i].pd;
+
+        div =  ((tda18271_cal_pll[i].d * (N / 1000)) << 7) / 125;
+        regs[R_CD1]   = 0xff & (div >> 16);
+        regs[R_CD2]   = 0xff & (div >> 8);
+        regs[R_CD3]   = 0xff & div;
+
+        /* calculate MAIN PLL */
+
+        switch (priv->mode) {
+        case TDA18271_ANALOG:
+                N = freq - 250000;
+                break;
+        case TDA18271_DIGITAL:
+                N = freq + bw / 2 + 1000000;
+                break;
+        }
+
+        i = 0;
+        while ((tda18271_main_pll[i].lomax * 1000) < N) {
+                if (tda18271_main_pll[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("main pll, pd = 0x%x, d = 0x%x, i = %d\n",
+                        tda18271_main_pll[i].pd, tda18271_main_pll[i].d, i);
+
+        regs[R_MPD]   = (0x7f & tda18271_main_pll[i].pd);
+
+        switch (priv->mode) {
+        case TDA18271_ANALOG:
+                regs[R_MPD]  &= ~0x08;
+                break;
+        case TDA18271_DIGITAL:
+                regs[R_MPD]  |=  0x08;
+                break;
+        }
+
+        div =  ((tda18271_main_pll[i].d * (N / 1000)) << 7) / 125;
+        regs[R_MD1]   = 0xff & (div >> 16);
+        regs[R_MD2]   = 0xff & (div >> 8);
+        regs[R_MD3]   = 0xff & div;
+
+        tda18271_write_regs(fe, R_EP3, 11);
+        msleep(5); /* RF tracking filter calibration initialization */
+
+        /* search for K,M,CO for RF Calibration */
+        i = 0;
+        while ((tda18271_km[i].rfmax * 1000) < freq) {
+                if (tda18271_km[i + 1].rfmax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("km = 0x%x, i = %d\n", tda18271_km[i].val, i);
+
+        regs[R_EB13] &= 0x83;
+        regs[R_EB13] |= tda18271_km[i].val;
+        tda18271_write_regs(fe, R_EB13, 1);
+
+        /* search for RF_BAND */
+        i = 0;
+        while ((tda18271_rf_band[i].rfmax * 1000) < freq) {
+                if (tda18271_rf_band[i + 1].rfmax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("rf band = 0x%x, i = %d\n",
+                        tda18271_rf_band[i].val, i);
+
+        regs[R_EP2]  &= ~0xe0; /* clear rf band bits */
+        regs[R_EP2]  |= (tda18271_rf_band[i].val << 5);
+
+        /* search for Gain_Taper */
+        i = 0;
+        while ((tda18271_gain_taper[i].rfmax * 1000) < freq) {
+                if (tda18271_gain_taper[i + 1].rfmax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("gain taper = 0x%x, i = %d\n",
+                        tda18271_gain_taper[i].val, i);
+
+        regs[R_EP2]  &= ~0x1f; /* clear gain taper bits */
+        regs[R_EP2]  |= tda18271_gain_taper[i].val;
+
+        tda18271_write_regs(fe, R_EP2, 1);
+        tda18271_write_regs(fe, R_EP1, 1);
+        tda18271_write_regs(fe, R_EP2, 1);
+        tda18271_write_regs(fe, R_EP1, 1);
+
+        regs[R_EB4]  &= 0x07;
+        regs[R_EB4]  |= 0x40;
+        tda18271_write_regs(fe, R_EB4, 1);
+
+        regs[R_EB7]   = 0x40;
+        tda18271_write_regs(fe, R_EB7, 1);
+        msleep(10);
+
+        regs[R_EB20]  = 0xec;
+        tda18271_write_regs(fe, R_EB20, 1);
+        msleep(60); /* RF tracking filter calibration completion */
+
+        regs[R_EP4]  &= ~0x03; /* set cal mode to normal */
+        tda18271_write_regs(fe, R_EP4, 1);
+
+        tda18271_write_regs(fe, R_EP1, 1);
+
+        /* RF tracking filer correction for VHF_Low band */
+        i = 0;
+        while ((tda18271_rf_cal[i].rfmax * 1000) < freq) {
+                if (tda18271_rf_cal[i].rfmax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("rf cal = 0x%x, i = %d\n", tda18271_rf_cal[i].val, i);
+
+        /* VHF_Low band only */
+        if (tda18271_rf_cal[i].rfmax != 0) {
+                regs[R_EB14]   = tda18271_rf_cal[i].val;
+                tda18271_write_regs(fe, R_EB14, 1);
+        }
+
+        /* Channel Configuration */
+
+        switch (priv->mode) {
+        case TDA18271_ANALOG:
+                regs[R_EB22]  = 0x2c;
+                break;
+        case TDA18271_DIGITAL:
+                regs[R_EB22]  = 0x37;
+                break;
+        }
+        tda18271_write_regs(fe, R_EB22, 1);
+
+        regs[R_EP1]  |= 0x40; /* set dis power level on */
+
+        /* set standard */
+        regs[R_EP3]  &= ~0x1f; /* clear std bits */
+
+        /* see table 22 */
+        regs[R_EP3]  |= std;
+
+        /* TO DO:           *
+         * ================ *
+         * FM radio,   0x18 *
+         * ATSC  6MHz, 0x1c *
+         * DVB-T 6MHz, 0x1c *
+         * DVB-T 7MHz, 0x1d *
+         * DVB-T 8MHz, 0x1e *
+         * QAM   6MHz, 0x1d *
+         * QAM   8MHz, 0x1f */
+
+        regs[R_EP4]  &= ~0x03; /* set cal mode to normal */
+
+        regs[R_EP4]  &= ~0x1c; /* clear if level bits */
+        switch (priv->mode) {
+        case TDA18271_ANALOG:
+                regs[R_MPD]  &= ~0x80; /* IF notch = 0 */
+                break;
+        case TDA18271_DIGITAL:
+                regs[R_EP4]  |= 0x04;
+                regs[R_MPD]  |= 0x80;
+                break;
+        }
+
+        regs[R_EP4]  &= ~0x80; /* turn this bit on only for fm */
+
+        /* FIXME: image rejection validity EP5[2:0] */
+
+        /* calculate MAIN PLL */
+        N = freq + ifc;
+
+        i = 0;
+        while ((tda18271_main_pll[i].lomax * 1000) < N) {
+                if (tda18271_main_pll[i + 1].lomax == 0)
+                        break;
+                i++;
+        }
+        tuner_extra_dbg("main pll, pd = 0x%x, d = 0x%x, i = %d\n",
+                        tda18271_main_pll[i].pd, tda18271_main_pll[i].d, i);
+
+        regs[R_MPD]   = (0x7f & tda18271_main_pll[i].pd);
+        switch (priv->mode) {
+        case TDA18271_ANALOG:
+                regs[R_MPD]  &= ~0x08;
+                break;
+        case TDA18271_DIGITAL:
+                regs[R_MPD]  |= 0x08;
+                break;
+        }
+
+        div =  ((tda18271_main_pll[i].d * (N / 1000)) << 7) / 125;
+        regs[R_MD1]   = 0xff & (div >> 16);
+        regs[R_MD2]   = 0xff & (div >> 8);
+        regs[R_MD3]   = 0xff & div;
+
+        tda18271_write_regs(fe, R_TM, 15);
+        msleep(5);
+        return 0;
+}
+
+/* ------------------------------------------------------------------ */
+
+static int tda18271_set_params(struct dvb_frontend *fe,
+                               struct dvb_frontend_parameters *params)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        u8 std;
+        u32 bw, sgIF = 0;
+
+        u32 freq = params->frequency;
+
+        priv->mode = TDA18271_DIGITAL;
+
+        /* see table 22 */
+        if (fe->ops.info.type == FE_ATSC) {
+                switch (params->u.vsb.modulation) {
+                case VSB_8:
+                case VSB_16:
+                        std = 0x1b; /* device-specific (spec says 0x1c) */
+                        sgIF = 5380000;
+                        break;
+                case QAM_64:
+                case QAM_256:
+                        std = 0x18; /* device-specific (spec says 0x1d) */
+                        sgIF = 4000000;
+                        break;
+                default:
+                        printk(KERN_WARNING "%s: modulation not set!\n",
+                               __FUNCTION__);
+                        return -EINVAL;
+                }
+                freq += 1750000; /* Adjust to center (+1.75MHZ) */
+                bw = 6000000;
+        } else if (fe->ops.info.type == FE_OFDM) {
+                switch (params->u.ofdm.bandwidth) {
+                case BANDWIDTH_6_MHZ:
+                        std = 0x1c;
+                        bw = 6000000;
+                        break;
+                case BANDWIDTH_7_MHZ:
+                        std = 0x1d;
+                        bw = 7000000;
+                        break;
+                case BANDWIDTH_8_MHZ:
+                        std = 0x1e;
+                        bw = 8000000;
+                        break;
+                default:
+                        printk(KERN_WARNING "%s: bandwidth not set!\n",
+                               __FUNCTION__);
+                        return -EINVAL;
+                }
+        } else {
+                printk(KERN_WARNING "%s: modulation type not supported!\n",
+                       __FUNCTION__);
+                return -EINVAL;
+        }
+
+        return tda18271_tune(fe, sgIF, freq, bw, std);
+}
+
+static int tda18271_set_analog_params(struct dvb_frontend *fe,
+                                      struct analog_parameters *params)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        u8 std;
+        unsigned int sgIF;
+        char *mode;
+
+        priv->mode = TDA18271_ANALOG;
+
+        /* see table 22 */
+        if (params->std & V4L2_STD_MN) {
+                std = 0x0d;
+                sgIF =  92;
+                mode = "MN";
+        } else if (params->std & V4L2_STD_B) {
+                std = 0x0e;
+                sgIF =  108;
+                mode = "B";
+        } else if (params->std & V4L2_STD_GH) {
+                std = 0x0f;
+                sgIF =  124;
+                mode = "GH";
+        } else if (params->std & V4L2_STD_PAL_I) {
+                std = 0x0f;
+                sgIF =  124;
+                mode = "I";
+        } else if (params->std & V4L2_STD_DK) {
+                std = 0x0f;
+                sgIF =  124;
+                mode = "DK";
+        } else if (params->std & V4L2_STD_SECAM_L) {
+                std = 0x0f;
+                sgIF =  124;
+                mode = "L";
+        } else if (params->std & V4L2_STD_SECAM_LC) {
+                std = 0x0f;
+                sgIF =  20;
+                mode = "LC";
+        } else {
+                std = 0x0f;
+                sgIF =  124;
+                mode = "xx";
+        }
+
+        if (params->mode == V4L2_TUNER_RADIO)
+                sgIF =  88; /* if frequency is 5.5 MHz */
+
+        tuner_dbg("setting tda18271 to system %s\n", mode);
+
+        return tda18271_tune(fe, sgIF * 62500, params->frequency * 62500,
+                             0, std);
+}
+
+static int tda18271_release(struct dvb_frontend *fe)
+{
+        kfree(fe->tuner_priv);
+        fe->tuner_priv = NULL;
+        return 0;
+}
+
+static int tda18271_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        *frequency = priv->frequency;
+        return 0;
+}
+
+static int tda18271_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
+{
+        struct tda18271_priv *priv = fe->tuner_priv;
+        *bandwidth = priv->bandwidth;
+        return 0;
+}
+
+static struct dvb_tuner_ops tda18271_tuner_ops = {
+        .info = {
+                .name = "NXP TDA18271HD",
+                .frequency_min  =  45000000,
+                .frequency_max  = 864000000,
+                .frequency_step =     62500
+        },
+        .set_params        = tda18271_set_params,
+        .set_analog_params = tda18271_set_analog_params,
+        .release           = tda18271_release,
+        .get_frequency     = tda18271_get_frequency,
+        .get_bandwidth     = tda18271_get_bandwidth,
+};
+
+struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
+                                     struct i2c_adapter *i2c)
+{
+        struct tda18271_priv *priv = NULL;
+
+        tuner_dbg("%s:\n", __FUNCTION__);
+        priv = kzalloc(sizeof(struct tda18271_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return NULL;
+
+        priv->i2c_addr = addr;
+        priv->i2c_adap = i2c;
+
+        memcpy(&fe->ops.tuner_ops, &tda18271_tuner_ops,
+               sizeof(struct dvb_tuner_ops));
+
+        fe->tuner_priv = priv;
+
+        return fe;
+}
+EXPORT_SYMBOL_GPL(tda18271_attach);
+MODULE_DESCRIPTION("NXP TDA18271HD analog / digital tuner driver");
+MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
+MODULE_LICENSE("GPL");
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/dvb/frontends/tda18271.h b/drivers/media/dvb/frontends/tda18271.h
new file mode 100644
index 000000000000..a8a19a7197f0
--- /dev/null
+++ b/drivers/media/dvb/frontends/tda18271.h
@@ -0,0 +1,40 @@
+/*
+    tda18271.h - header for the Philips / NXP TDA18271 silicon tuner
+
+    Copyright (C) 2007 Michael Krufky (mkrufky@linuxtv.org)
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __TDA18271_H__
+#define __TDA18271_H__
+
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
+
+#if defined(CONFIG_DVB_TDA18271) || (defined(CONFIG_DVB_TDA18271_MODULE) && defined(MODULE))
+extern struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
+                                            struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe,
+                                                   u8 addr,
+                                                   struct i2c_adapter *i2c)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif
+
+#endif /* __TDA18271_H__ */
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 5d30cbcd7361..a38ed9db6403 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -25,8 +25,9 @@
 #include <linux/videodev.h>
 #include "tda8290.h"
 #include "tda827x.h"
+#include "tda18271.h"
 
-static int tuner_debug = 0;
+static int tuner_debug;
 module_param_named(debug, tuner_debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
@@ -65,6 +66,34 @@ static void tda8290_i2c_bridge(struct tuner *t, int close)
         }
 }
 
+static void tda8295_i2c_bridge(struct tuner *t, int close)
+{
+        struct tda8290_priv *priv = t->priv;
+
+        unsigned char  enable[2] = { 0x45, 0xc1 };
+        unsigned char disable[2] = { 0x46, 0x00 };
+        unsigned char buf[3] = { 0x45, 0x01, 0x00 };
+        unsigned char *msg;
+        if (close) {
+                msg = enable;
+                tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
+                /* let the bridge stabilize */
+                msleep(20);
+        } else {
+                msg = disable;
+                tuner_i2c_xfer_send(&priv->i2c_props, msg, 1);
+                tuner_i2c_xfer_recv(&priv->i2c_props, &msg[1], 1);
+
+                buf[2] = msg[1];
+                buf[2] &= ~0x04;
+                tuner_i2c_xfer_send(&priv->i2c_props, buf, 3);
+                msleep(5);
+
+                msg[1] |= 0x04;
+                tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
+        }
+}
+
 /*---------------------------------------------------------------------*/
 
 static void set_audio(struct tuner *t)
@@ -233,6 +262,153 @@ static void tda8290_set_freq(struct tuner *t, unsigned int freq)
 
 /*---------------------------------------------------------------------*/
 
+static void tda8295_power(struct tuner *t, int enable)
+{
+        struct tda8290_priv *priv = t->priv;
+        unsigned char buf[] = { 0x30, 0x00 }; /* clb_stdbt */
+
+        tuner_i2c_xfer_send(&priv->i2c_props, &buf[0], 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &buf[1], 1);
+
+        if (enable)
+                buf[1] = 0x01;
+        else
+                buf[1] = 0x03;
+
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2);
+}
+
+static void tda8295_set_easy_mode(struct tuner *t, int enable)
+{
+        struct tda8290_priv *priv = t->priv;
+        unsigned char buf[] = { 0x01, 0x00 };
+
+        tuner_i2c_xfer_send(&priv->i2c_props, &buf[0], 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &buf[1], 1);
+
+        if (enable)
+                buf[1] = 0x01; /* rising edge sets regs 0x02 - 0x23 */
+        else
+                buf[1] = 0x00; /* reset active bit */
+
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2);
+}
+
+static void tda8295_set_video_std(struct tuner *t)
+{
+        struct tda8290_priv *priv = t->priv;
+        unsigned char buf[] = { 0x00, priv->tda8290_easy_mode };
+
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2);
+
+        tda8295_set_easy_mode(t, 1);
+        msleep(20);
+        tda8295_set_easy_mode(t, 0);
+}
+
+/*---------------------------------------------------------------------*/
+
+static void tda8295_agc1_out(struct tuner *t, int enable)
+{
+        struct tda8290_priv *priv = t->priv;
+        unsigned char buf[] = { 0x02, 0x00 }; /* DIV_FUNC */
+
+        tuner_i2c_xfer_send(&priv->i2c_props, &buf[0], 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &buf[1], 1);
+
+        if (enable)
+                buf[1] &= ~0x40;
+        else
+                buf[1] |= 0x40;
+
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2);
+}
+
+static void tda8295_agc2_out(struct tuner *t, int enable)
+{
+        struct tda8290_priv *priv = t->priv;
+        unsigned char set_gpio_cf[]    = { 0x44, 0x00 };
+        unsigned char set_gpio_val[]   = { 0x46, 0x00 };
+
+        tuner_i2c_xfer_send(&priv->i2c_props, &set_gpio_cf[0], 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &set_gpio_cf[1], 1);
+        tuner_i2c_xfer_send(&priv->i2c_props, &set_gpio_val[0], 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &set_gpio_val[1], 1);
+
+        set_gpio_cf[1] &= 0xf0; /* clear GPIO_0 bits 3-0 */
+
+        if (enable) {
+                set_gpio_cf[1]  |= 0x01; /* config GPIO_0 as Open Drain Out */
+                set_gpio_val[1] &= 0xfe; /* set GPIO_0 pin low */
+        }
+        tuner_i2c_xfer_send(&priv->i2c_props, set_gpio_cf, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_gpio_val, 2);
+}
+
+static int tda8295_has_signal(struct tuner *t)
+{
+        struct tda8290_priv *priv = t->priv;
+
+        unsigned char hvpll_stat = 0x26;
+        unsigned char ret;
+
+        tuner_i2c_xfer_send(&priv->i2c_props, &hvpll_stat, 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &ret, 1);
+        return (ret & 0x01) ? 65535 : 0;
+}
+
+/*---------------------------------------------------------------------*/
+
+static void tda8295_set_freq(struct tuner *t, unsigned int freq)
+{
+        struct tda8290_priv *priv = t->priv;
+        u16 ifc;
+
+        unsigned char blanking_mode[]     = { 0x1d, 0x00 };
+
+        struct analog_parameters params = {
+                .frequency = freq,
+                .mode      = t->mode,
+                .audmode   = t->audmode,
+                .std       = t->std
+        };
+
+        set_audio(t);
+
+        ifc = priv->cfg.sgIF; /* FIXME */
+
+        tuner_dbg("%s: ifc = %u, freq = %d\n", __FUNCTION__, ifc, freq);
+
+        tda8295_power(t, 1);
+        tda8295_agc1_out(t, 1);
+
+        tuner_i2c_xfer_send(&priv->i2c_props, &blanking_mode[0], 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, &blanking_mode[1], 1);
+
+        tda8295_set_video_std(t);
+
+        blanking_mode[1] = 0x03;
+        tuner_i2c_xfer_send(&priv->i2c_props, blanking_mode, 2);
+        msleep(20);
+
+        tda8295_i2c_bridge(t, 1);
+
+        if (t->fe.ops.tuner_ops.set_analog_params)
+                t->fe.ops.tuner_ops.set_analog_params(&t->fe, &params);
+
+        if (priv->cfg.agcf)
+                priv->cfg.agcf(&t->fe);
+
+        if (tda8295_has_signal(t))
+                tuner_dbg("tda8295 is locked\n");
+        else
+                tuner_dbg("tda8295 not locked, no signal?\n");
+
+        tda8295_i2c_bridge(t, 0);
+}
+
+/*---------------------------------------------------------------------*/
+
 static int tda8290_has_signal(struct tuner *t)
 {
         struct tda8290_priv *priv = t->priv;
@@ -264,6 +440,13 @@ static void tda8290_standby(struct tuner *t)
         tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
 }
 
+static void tda8295_standby(struct tuner *t)
+{
+        tda8295_agc1_out(t, 0); /* Put AGC in tri-state */
+
+        tda8295_power(t, 0);
+}
+
 static void tda8290_init_if(struct tuner *t)
 {
         struct tda8290_priv *priv = t->priv;
@@ -279,6 +462,35 @@ static void tda8290_init_if(struct tuner *t)
         tuner_i2c_xfer_send(&priv->i2c_props, set_VS, 2);
 }
 
+static void tda8295_init_if(struct tuner *t)
+{
+        struct tda8290_priv *priv = t->priv;
+
+        static unsigned char set_adc_ctl[]       = { 0x33, 0x14 };
+        static unsigned char set_adc_ctl2[]      = { 0x34, 0x00 };
+        static unsigned char set_pll_reg6[]      = { 0x3e, 0x63 };
+        static unsigned char set_pll_reg0[]      = { 0x38, 0x23 };
+        static unsigned char set_pll_reg7[]      = { 0x3f, 0x01 };
+        static unsigned char set_pll_reg10[]     = { 0x42, 0x61 };
+        static unsigned char set_gpio_reg0[]     = { 0x44, 0x0b };
+
+        tda8295_power(t, 1);
+
+        tda8295_set_easy_mode(t, 0);
+        tda8295_set_video_std(t);
+
+        tuner_i2c_xfer_send(&priv->i2c_props, set_adc_ctl, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_adc_ctl2, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_pll_reg6, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_pll_reg0, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_pll_reg7, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_pll_reg10, 2);
+        tuner_i2c_xfer_send(&priv->i2c_props, set_gpio_reg0, 2);
+
+        tda8295_agc1_out(t, 0);
+        tda8295_agc2_out(t, 0);
+}
+
 static void tda8290_init_tuner(struct tuner *t)
 {
         struct tda8290_priv *priv = t->priv;
@@ -298,7 +510,7 @@ static void tda8290_init_tuner(struct tuner *t)
 
 /*---------------------------------------------------------------------*/
 
-static void tda8290_release(struct tuner *t)
+static void tda829x_release(struct tuner *t)
 {
         if (t->fe.ops.tuner_ops.release)
                 t->fe.ops.tuner_ops.release(&t->fe);
@@ -312,7 +524,15 @@ static struct tuner_operations tda8290_tuner_ops = {
         .set_radio_freq = tda8290_set_freq,
         .has_signal     = tda8290_has_signal,
         .standby        = tda8290_standby,
-        .release        = tda8290_release,
+        .release        = tda829x_release,
+};
+
+static struct tuner_operations tda8295_tuner_ops = {
+        .set_tv_freq    = tda8295_set_freq,
+        .set_radio_freq = tda8295_set_freq,
+        .has_signal     = tda8295_has_signal,
+        .standby        = tda8295_standby,
+        .release        = tda829x_release,
 };
 
 int tda8290_attach(struct tuner *t)
@@ -403,6 +623,95 @@ int tda8290_attach(struct tuner *t)
         tda8290_init_if(t);
         return 0;
 }
+EXPORT_SYMBOL_GPL(tda8290_attach);
+
+int tda8295_attach(struct tuner *t)
+{
+        struct tda8290_priv *priv = NULL;
+        u8 data;
+        int i, ret, tuners_found;
+        u32 tuner_addrs;
+        struct i2c_msg msg = { .flags = I2C_M_RD, .buf = &data, .len = 1 };
+
+        priv = kzalloc(sizeof(struct tda8290_priv), GFP_KERNEL);
+        if (priv == NULL)
+                return -ENOMEM;
+        t->priv = priv;
+
+        priv->i2c_props.addr     = t->i2c.addr;
+        priv->i2c_props.adap     = t->i2c.adapter;
+
+        tda8295_i2c_bridge(t, 1);
+        /* probe for tuner chip */
+        tuners_found = 0;
+        tuner_addrs = 0;
+        for (i = 0x60; i <= 0x63; i++) {
+                msg.addr = i;
+                ret = i2c_transfer(priv->i2c_props.adap, &msg, 1);
+                if (ret == 1) {
+                        tuners_found++;
+                        tuner_addrs = (tuner_addrs << 8) + i;
+                }
+        }
+        /* if there is more than one tuner, we expect the right one is
+           behind the bridge and we choose the highest address that doesn't
+           give a response now
+         */
+        tda8295_i2c_bridge(t, 0);
+        if (tuners_found > 1)
+                for (i = 0; i < tuners_found; i++) {
+                        msg.addr = tuner_addrs  & 0xff;
+                        ret = i2c_transfer(priv->i2c_props.adap, &msg, 1);
+                        if (ret == 1)
+                                tuner_addrs = tuner_addrs >> 8;
+                        else
+                                break;
+                }
+        if (tuner_addrs == 0) {
+                tuner_addrs = 0x60;
+                tuner_info("could not clearly identify tuner address, "
+                           "defaulting to %x\n", tuner_addrs);
+        } else {
+                tuner_addrs = tuner_addrs & 0xff;
+                tuner_info("setting tuner address to %x\n", tuner_addrs);
+        }
+        priv->tda827x_addr = tuner_addrs;
+        msg.addr = tuner_addrs;
+
+        tda8295_i2c_bridge(t, 1);
+        ret = i2c_transfer(priv->i2c_props.adap, &msg, 1);
+        tda8295_i2c_bridge(t, 0);
+        if (ret != 1)
+                tuner_warn("TDA827x access failed!\n");
+        if ((data & 0x3c) == 0) {
+                strlcpy(t->i2c.name, "tda8295+18271", sizeof(t->i2c.name));
+                tda18271_attach(&t->fe, priv->tda827x_addr,
+                                priv->i2c_props.adap);
+                priv->tda827x_ver = 4;
+        } else {
+                strlcpy(t->i2c.name, "tda8295+75a", sizeof(t->i2c.name));
+                tda827x_attach(&t->fe, priv->tda827x_addr,
+                               priv->i2c_props.adap, &priv->cfg);
+
+                /* FIXME: tda827x module doesn't probe the tuner until
+                 * tda827x_initial_sleep is called
+                 */
+                if (t->fe.ops.tuner_ops.sleep)
+                        t->fe.ops.tuner_ops.sleep(&t->fe);
+                priv->tda827x_ver = 2;
+        }
+        priv->tda827x_ver |= 1; /* signifies 8295 vs 8290 */
+        tuner_info("type set to %s\n", t->i2c.name);
+
+        memcpy(&t->ops, &tda8295_tuner_ops, sizeof(struct tuner_operations));
+
+        priv->cfg.tda827x_lpsel = 0;
+        t->mode = V4L2_TUNER_ANALOG_TV;
+
+        tda8295_init_if(t);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(tda8295_attach);
 
 int tda8290_probe(struct tuner *t)
 {
@@ -434,12 +743,10 @@ int tda8290_probe(struct tuner *t)
         tuner_i2c_xfer_send(&i2c_props, restore_9886, 3);
         return -1;
 }
-
 EXPORT_SYMBOL_GPL(tda8290_probe);
-EXPORT_SYMBOL_GPL(tda8290_attach);
 
 MODULE_DESCRIPTION("Philips TDA8290 + TDA8275 / TDA8275a tuner driver");
-MODULE_AUTHOR("Gerd Knorr, Hartmut Hackmann");
+MODULE_AUTHOR("Gerd Knorr, Hartmut Hackmann, Michael Krufky");
 MODULE_LICENSE("GPL");
 
 /*
diff --git a/drivers/media/video/tda8290.h b/drivers/media/video/tda8290.h
index 9b63e62b3a0f..dbbcb0f001e0 100644
--- a/drivers/media/video/tda8290.h
+++ b/drivers/media/video/tda8290.h
@@ -24,6 +24,7 @@
 extern int tda8290_probe(struct tuner *t);
 
 extern int tda8290_attach(struct tuner *t);
+extern int tda8295_attach(struct tuner *t);
 #else
 static inline int tda8290_probe(struct tuner *t)
 {
@@ -37,6 +38,13 @@ static inline int tda8290_attach(struct tuner *t)
                __FUNCTION__);
         return -EINVAL;
 }
+
+static inline int tda8295_attach(struct tuner *t)
+{
+        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+               __FUNCTION__);
+        return -EINVAL;
+}
 #endif
 
 #endif /* __TDA8290_H__ */
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 99558c708ae7..6ae8cb205d8e 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -278,6 +278,11 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 tda8290_attach(t);
                 break;
         }
+        case TUNER_PHILIPS_TDA8295:
+        {
+                tda8295_attach(t);
+                break;
+        }
         case TUNER_TEA5767:
                 if (tea5767_attach(&t->fe, t->i2c.adapter, t->i2c.addr) == NULL) {
                         t->type = TUNER_ABSENT;
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index ac363f019227..4a674c436cf4 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -1475,6 +1475,9 @@ struct tunertype tuners[] = {
                 .name   = "Philips TEA5761 FM Radio",
                 /* see tea5767.c for details */
         },
+        [TUNER_PHILIPS_TDA8295] = { /* Philips PAL|NTSC */
+                .name   = "tda8295+18271",
+                /* see tda8290.c for details */ },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 4b2c4034f5b3..27bfe6d3a33c 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -257,7 +257,7 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,        "LG TAPQ_H702F"},
         { TUNER_ABSENT,        "TCL M09WPP_4N_E"},
         { TUNER_ABSENT,        "MaxLinear MXL5005_v2"},
-        { TUNER_ABSENT,        "Philips 18271_8295"},
+        { TUNER_PHILIPS_TDA8295, "Philips 18271_8295"},
 };
 
 static struct HAUPPAUGE_AUDIOIC