5 files changed, 62 insertions, 12 deletions

diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index b10935630154..bc4b004ba7db 100644
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -27,7 +27,7 @@ module_param_named(debug, tda18271_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debug level "
                  "(info=1, map=2, reg=4, adv=8, cal=16 (or-able))");
 
-static int tda18271_cal_on_startup;
+static int tda18271_cal_on_startup = -1;
 module_param_named(cal, tda18271_cal_on_startup, int, 0644);
 MODULE_PARM_DESC(cal, "perform RF tracking filter calibration on startup");
 
@@ -1192,10 +1192,25 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
         case 0:
                 goto fail;
         case 1:
+        {
                 /* new tuner instance */
+                int rf_cal_on_startup;
+
                 priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
                 priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
                 priv->config = (cfg) ? cfg->config : 0;
+
+                /* tda18271_cal_on_startup == -1 when cal
+                 * module option is unset */
+                if (tda18271_cal_on_startup == -1) {
+                        /* honor attach-time configuration */
+                        rf_cal_on_startup =
+                                ((cfg) && (cfg->rf_cal_on_startup)) ? 1 : 0;
+                } else {
+                        /* module option overrides attach configuration */
+                        rf_cal_on_startup = tda18271_cal_on_startup;
+                }
+
                 priv->cal_initialized = false;
                 mutex_init(&priv->lock);
 
@@ -1213,11 +1228,12 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                 mutex_lock(&priv->lock);
                 tda18271_init_regs(fe);
 
-                if ((tda18271_cal_on_startup) && (priv->id == TDA18271HDC2))
+                if ((rf_cal_on_startup) && (priv->id == TDA18271HDC2))
                         tda18271c2_rf_cal_init(fe);
 
                 mutex_unlock(&priv->lock);
                 break;
+        }
         default:
                 /* existing tuner instance */
                 fe->tuner_priv = priv;
diff --git a/drivers/media/common/tuners/tda18271-priv.h b/drivers/media/common/tuners/tda18271-priv.h
index 74beb28806f8..e6a80ad09356 100644
--- a/drivers/media/common/tuners/tda18271-priv.h
+++ b/drivers/media/common/tuners/tda18271-priv.h
@@ -137,17 +137,17 @@ extern int tda18271_debug;
 #define tda_printk(kern, fmt, arg...) \
         printk(kern "%s: " fmt, __func__, ##arg)
 
-#define dprintk(kern, lvl, fmt, arg...) do {\
+#define tda_dprintk(lvl, fmt, arg...) do {\
         if (tda18271_debug & lvl) \
-                tda_printk(kern, fmt, ##arg); } while (0)
-
-#define tda_info(fmt, arg...) printk(KERN_INFO              fmt, ##arg)
-#define tda_warn(fmt, arg...) tda_printk(KERN_WARNING,      fmt, ##arg)
-#define tda_err(fmt, arg...)  tda_printk(KERN_ERR,          fmt, ##arg)
-#define tda_dbg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_INFO, fmt, ##arg)
-#define tda_map(fmt, arg...)  dprintk(KERN_DEBUG, DBG_MAP,  fmt, ##arg)
-#define tda_reg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_REG,  fmt, ##arg)
-#define tda_cal(fmt, arg...)  dprintk(KERN_DEBUG, DBG_CAL,  fmt, ##arg)
+                tda_printk(KERN_DEBUG, fmt, ##arg); } while (0)
+
+#define tda_info(fmt, arg...)     printk(KERN_INFO     fmt, ##arg)
+#define tda_warn(fmt, arg...) tda_printk(KERN_WARNING, fmt, ##arg)
+#define tda_err(fmt, arg...)  tda_printk(KERN_ERR,     fmt, ##arg)
+#define tda_dbg(fmt, arg...)  tda_dprintk(DBG_INFO,    fmt, ##arg)
+#define tda_map(fmt, arg...)  tda_dprintk(DBG_MAP,     fmt, ##arg)
+#define tda_reg(fmt, arg...)  tda_dprintk(DBG_REG,     fmt, ##arg)
+#define tda_cal(fmt, arg...)  tda_dprintk(DBG_CAL,     fmt, ##arg)
 
 #define tda_fail(ret)                                                        \
 ({                                                                           \
diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/common/tuners/tda18271.h
index 53a9892a18d0..71bac9593f1e 100644
--- a/drivers/media/common/tuners/tda18271.h
+++ b/drivers/media/common/tuners/tda18271.h
@@ -77,6 +77,9 @@ struct tda18271_config {
         /* use i2c gate provided by analog or digital demod */
         enum tda18271_i2c_gate gate;
 
+        /* force rf tracking filter calibration on startup */
+        unsigned int rf_cal_on_startup:1;
+
         /* some i2c providers cant write all 39 registers at once */
         unsigned int small_i2c:1;
 
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 149d54cdf7b9..8abbcc5fcf95 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -144,6 +144,8 @@ static inline int tuner_stereo(const int type, const int status)
         case TUNER_LG_NTSC_TAPE:
         case TUNER_TCL_MF02GIP_5N:
                 return ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
+        case TUNER_PHILIPS_FM1216MK5:
+                return status | TUNER_STEREO;
         default:
                 return status & TUNER_STEREO;
         }
@@ -508,6 +510,10 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)
         case TUNER_TCL_MF02GIP_5N:
                 buffer[3] = 0x19;
                 break;
+        case TUNER_PHILIPS_FM1216MK5:
+                buffer[2] = 0x88;
+                buffer[3] = 0x09;
+                break;
         case TUNER_TNF_5335MF:
                 buffer[3] = 0x11;
                 break;
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index 6a7f1a417c27..5c6ef1e23c94 100644
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -1301,6 +1301,25 @@ static struct tuner_params tuner_fq1216lme_mk3_params[] = {
         },
 };
 
+/* ----- TUNER_PARTSNIC_PTI_5NF05 - Partsnic (Daewoo) PTI-5NF05 NTSC ----- */
+
+static struct tuner_range tuner_partsnic_pti_5nf05_ranges[] = {
+        /* The datasheet specified channel ranges and the bandswitch byte */
+        /* The control byte value of 0x8e is just a guess */
+        { 16 * 133.25 /*MHz*/, 0x8e, 0x01, }, /* Channels    2 -    B */
+        { 16 * 367.25 /*MHz*/, 0x8e, 0x02, }, /* Channels    C - W+11 */
+        { 16 * 999.99        , 0x8e, 0x08, }, /* Channels W+12 -   69 */
+};
+
+static struct tuner_params tuner_partsnic_pti_5nf05_params[] = {
+        {
+                .type   = TUNER_PARAM_TYPE_NTSC,
+                .ranges = tuner_partsnic_pti_5nf05_ranges,
+                .count  = ARRAY_SIZE(tuner_partsnic_pti_5nf05_ranges),
+                .cb_first_if_lower_freq = 1, /* not specified but safe to do */
+        },
+};
+
 /* --------------------------------------------------------------------- */
 
 struct tunertype tuners[] = {
@@ -1753,6 +1772,12 @@ struct tunertype tuners[] = {
                 .params = tuner_fq1216lme_mk3_params,
                 .count  = ARRAY_SIZE(tuner_fq1216lme_mk3_params),
         },
+
+        [TUNER_PARTSNIC_PTI_5NF05] = {
+                .name = "Partsnic (Daewoo) PTI-5NF05",
+                .params = tuner_partsnic_pti_5nf05_params,
+                .count  = ARRAY_SIZE(tuner_partsnic_pti_5nf05_params),
+        },
 };
 EXPORT_SYMBOL(tuners);