aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-04-19 17:50:35 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:58:14 -0400
commitc344933af5a8610d71bd0d92fe43a1519ed72ed8 (patch)
treed82bcdd85c83a2f8483c35b88dd813b6642c8fbb
parent8d6cdd235d19c3bb1f86f40bf0305049c1a61955 (diff)
V4L/DVB (3814): Add support for Samsung TCPG 6121P30A PAL tuner.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.tuner1
-rw-r--r--drivers/media/video/tuner-types.c21
-rw-r--r--drivers/media/video/tveeprom.c2
-rw-r--r--include/media/tuner.h1
4 files changed, 24 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 1bcdac67dd8c..46ae7775ba03 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -71,3 +71,4 @@ tuner=69 - Tena TNF 5335 and similar models
71tuner=70 - Samsung TCPN 2121P30A 71tuner=70 - Samsung TCPN 2121P30A
72tuner=71 - Xceive xc3028 72tuner=71 - Xceive xc3028
73tuner=72 - Thomson FE6600 73tuner=72 - Thomson FE6600
74tuner=73 - Samsung TCPG 6121P30A
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index a1ae036b44ec..79410566030f 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -1024,6 +1024,22 @@ static struct tuner_params tuner_thomson_fe6600_params[] = {
1024 }, 1024 },
1025}; 1025};
1026 1026
1027/* ------------ TUNER_SAMSUNG_TCPG_6121P30A - Samsung PAL ------------ */
1028
1029static struct tuner_range tuner_samsung_tcpg_6121p30a_pal_ranges[] = {
1030 { 16 * 146.25 /*MHz*/, 0xce, 0x01, },
1031 { 16 * 428.50 /*MHz*/, 0xce, 0x02, },
1032 { 16 * 999.99 , 0xce, 0x08, },
1033};
1034
1035static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = {
1036 {
1037 .type = TUNER_PARAM_TYPE_PAL,
1038 .ranges = tuner_samsung_tcpg_6121p30a_pal_ranges,
1039 .count = ARRAY_SIZE(tuner_samsung_tcpg_6121p30a_pal_ranges),
1040 },
1041};
1042
1027/* --------------------------------------------------------------------- */ 1043/* --------------------------------------------------------------------- */
1028 1044
1029struct tunertype tuners[] = { 1045struct tunertype tuners[] = {
@@ -1400,6 +1416,11 @@ struct tunertype tuners[] = {
1400 .params = tuner_thomson_fe6600_params, 1416 .params = tuner_thomson_fe6600_params,
1401 .count = ARRAY_SIZE(tuner_thomson_fe6600_params), 1417 .count = ARRAY_SIZE(tuner_thomson_fe6600_params),
1402 }, 1418 },
1419 [TUNER_SAMSUNG_TCPG_6121P30A] = { /* Samsung PAL */
1420 .name = "Samsung TCPG 6121P30A",
1421 .params = tuner_samsung_tcpg_6121p30a_params,
1422 .count = ARRAY_SIZE(tuner_samsung_tcpg_6121p30a_params),
1423 },
1403}; 1424};
1404 1425
1405unsigned const int tuner_count = ARRAY_SIZE(tuners); 1426unsigned const int tuner_count = ARRAY_SIZE(tuners);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index b463e996961a..30f8d80ddcaa 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -200,7 +200,7 @@ hauppauge_tuner[] =
200 { TUNER_ABSENT, "Philips FQ1286A MK4"}, 200 { TUNER_ABSENT, "Philips FQ1286A MK4"},
201 { TUNER_ABSENT, "Philips FQ1216ME MK5"}, 201 { TUNER_ABSENT, "Philips FQ1216ME MK5"},
202 { TUNER_ABSENT, "Philips FQ1236 MK5"}, 202 { TUNER_ABSENT, "Philips FQ1236 MK5"},
203 { TUNER_ABSENT, "Samsung TCPG_6121P30A"}, 203 { TUNER_SAMSUNG_TCPG_6121P30A, "Samsung TCPG 6121P30A"},
204 { TUNER_TCL_2002MB, "TCL 2002MB_3H"}, 204 { TUNER_TCL_2002MB, "TCL 2002MB_3H"},
205 { TUNER_ABSENT, "TCL 2002MI_3H"}, 205 { TUNER_ABSENT, "TCL 2002MI_3H"},
206 { TUNER_TCL_2002N, "TCL 2002N 5H"}, 206 { TUNER_TCL_2002N, "TCL 2002N 5H"},
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 017fed7d5e4d..0f4f2de65042 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -119,6 +119,7 @@
119#define TUNER_XCEIVE_XC3028 71 119#define TUNER_XCEIVE_XC3028 71
120 120
121#define TUNER_THOMSON_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */ 121#define TUNER_THOMSON_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */
122#define TUNER_SAMSUNG_TCPG_6121P30A 73 /* Hauppauge PVR-500 PAL */
122 123
123/* tv card specific */ 124/* tv card specific */
124#define TDA9887_PRESENT (1<<0) 125#define TDA9887_PRESENT (1<<0)