3 files changed, 10 insertions, 0 deletions

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index ad85bef1c3d5..949c2550fcf5 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -189,6 +189,13 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 i2c_master_send(c, buffer, 4);
                 default_tuner_init(c);
                 break;
+        case TUNER_PHILIPS_TD1316:
+                buffer[0] = 0x0b;
+                buffer[1] = 0xdc;
+                buffer[2] = 0x86;
+                buffer[3] = 0xa4;
+                i2c_master_send(c,buffer,4);
+                default_tuner_init(c);
         default:
                 default_tuner_init(c);
                 break;
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 0ae39be3ca56..3af055970dd2 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -248,6 +248,8 @@ static struct tunertype tuners[] = {
           16*160.25,16*464.25,0x01,0x02,0x08,0x8e,623},
         { "LG NTSC (TALN mini series)", LGINNOTEK, NTSC,
           16*137.25,16*373.25,0x01,0x02,0x08,0x8e,732 },
+        { "Philips TD1316 Hybrid Tuner", Philips, PAL,
+          16*160.00,16*442.00,0xa1,0xa2,0xa4,0xc8,623 },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 4ad08e24a1aa..4f47eac90caf 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -110,6 +110,7 @@
 #define TUNER_LG_TDVS_H062F             64      /* DViCO FusionHDTV 5 */
 #define TUNER_YMEC_TVF66T5_B_DFF        65      /* Acorp Y878F */
 #define TUNER_LG_NTSC_TALN_MINI         66
+#define TUNER_PHILIPS_TD1316            67
 
 #define NOTUNER 0
 #define PAL     1       /* PAL_BG */