4 files changed, 27 insertions, 1 deletions

diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 0bf3d5bf9ef8..f6d0cf7b7922 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -68,3 +68,4 @@ tuner=66 - LG NTSC (TALN mini series)
 tuner=67 - Philips TD1316 Hybrid Tuner
 tuner=68 - Philips TUV1236D ATSC/NTSC dual in
 tuner=69 - Tena TNF 5335 MF
+tuner=70 - Samsung TCPN 2121P30A
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index de9d4925d8e4..32c9be4c5ca6 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -1077,6 +1077,24 @@ static struct tuner_params tuner_tnf_5335mf_params[] = {
         },
 };
 
+/* 70-79 */
+/* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */
+
+static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = {
+        { 16 * 175.75 /*MHz*/, 0x01, },
+        { 16 * 410.25 /*MHz*/, 0x02, },
+        { 16 * 999.99        , 0x08, },
+};
+
+static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
+        {
+                .type   = TUNER_PARAM_TYPE_NTSC,
+                .ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges,
+                .count  = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges),
+                .config = 0xce,
+        },
+};
+
 /* --------------------------------------------------------------------- */
 
 struct tunertype tuners[] = {
@@ -1371,6 +1389,12 @@ struct tunertype tuners[] = {
                 .name   = "Tena TNF 5335 MF",
                 .params = tuner_tnf_5335mf_params,
         },
+
+        /* 70-79 */
+        [TUNER_SAMSUNG_TCPN_2121P30A] = { /* Samsung NTSC */
+                .name   = "Samsung TCPN 2121P30A",
+                .params = tuner_samsung_tcpn_2121p30a_params,
+        },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5e71a354e879..582551b0969b 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -190,7 +190,7 @@ hauppauge_tuner[] =
         { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},
         { TUNER_TCL_2002N,     "TCL 2002N 6A"},
         { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"},
-        { TUNER_ABSENT,        "Samsung TCPN 2121P30A"},
+        { TUNER_SAMSUNG_TCPN_2121P30A, "Samsung TCPN 2121P30A"},
         { TUNER_ABSENT,        "Samsung TCPE 4121P30A"},
         { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"},
         /* 90-99 */
diff --git a/include/media/tuner.h b/include/media/tuner.h
index c88b506971cf..a1d63787bc08 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -115,6 +115,7 @@
 
 #define TUNER_PHILIPS_TUV1236D          68      /* ATI HDTV Wonder */
 #define TUNER_TNF_5335MF                69      /* Sabrent Bt848   */
+#define TUNER_SAMSUNG_TCPN_2121P30A     70      /* Hauppauge PVR-500MCE NTSC */
 
 /* tv card specific */
 #define TDA9887_PRESENT                 (1<<0)