diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-13 11:10:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-13 11:10:25 -0500 |
commit | b3d37042d7d33baf0247d1df31031e64427f39b3 (patch) | |
tree | c7463cf80fbdfd5d09d4af4fed95d87bdcfbef92 | |
parent | 7b0ac9cdd42b254ae2ec0f6c1cc6389655e4ba96 (diff) |
V4L/DVB (3363): Add support for Samsung tuner TCPN 2121P30A
- Add support for Samsung tuner TCPN 2121P30A, used in
Hauppauge PVR-500 cards.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/video4linux/CARDLIST.tuner | 1 | ||||
-rw-r--r-- | drivers/media/video/tuner-types.c | 24 | ||||
-rw-r--r-- | drivers/media/video/tveeprom.c | 2 | ||||
-rw-r--r-- | include/media/tuner.h | 1 |
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) | |||
68 | tuner=67 - Philips TD1316 Hybrid Tuner | 68 | tuner=67 - Philips TD1316 Hybrid Tuner |
69 | tuner=68 - Philips TUV1236D ATSC/NTSC dual in | 69 | tuner=68 - Philips TUV1236D ATSC/NTSC dual in |
70 | tuner=69 - Tena TNF 5335 MF | 70 | tuner=69 - Tena TNF 5335 MF |
71 | 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[] = { | |||
1077 | }, | 1077 | }, |
1078 | }; | 1078 | }; |
1079 | 1079 | ||
1080 | /* 70-79 */ | ||
1081 | /* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */ | ||
1082 | |||
1083 | static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = { | ||
1084 | { 16 * 175.75 /*MHz*/, 0x01, }, | ||
1085 | { 16 * 410.25 /*MHz*/, 0x02, }, | ||
1086 | { 16 * 999.99 , 0x08, }, | ||
1087 | }; | ||
1088 | |||
1089 | static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = { | ||
1090 | { | ||
1091 | .type = TUNER_PARAM_TYPE_NTSC, | ||
1092 | .ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges, | ||
1093 | .count = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges), | ||
1094 | .config = 0xce, | ||
1095 | }, | ||
1096 | }; | ||
1097 | |||
1080 | /* --------------------------------------------------------------------- */ | 1098 | /* --------------------------------------------------------------------- */ |
1081 | 1099 | ||
1082 | struct tunertype tuners[] = { | 1100 | struct tunertype tuners[] = { |
@@ -1371,6 +1389,12 @@ struct tunertype tuners[] = { | |||
1371 | .name = "Tena TNF 5335 MF", | 1389 | .name = "Tena TNF 5335 MF", |
1372 | .params = tuner_tnf_5335mf_params, | 1390 | .params = tuner_tnf_5335mf_params, |
1373 | }, | 1391 | }, |
1392 | |||
1393 | /* 70-79 */ | ||
1394 | [TUNER_SAMSUNG_TCPN_2121P30A] = { /* Samsung NTSC */ | ||
1395 | .name = "Samsung TCPN 2121P30A", | ||
1396 | .params = tuner_samsung_tcpn_2121p30a_params, | ||
1397 | }, | ||
1374 | }; | 1398 | }; |
1375 | 1399 | ||
1376 | unsigned const int tuner_count = ARRAY_SIZE(tuners); | 1400 | 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[] = | |||
190 | { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"}, | 190 | { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"}, |
191 | { TUNER_TCL_2002N, "TCL 2002N 6A"}, | 191 | { TUNER_TCL_2002N, "TCL 2002N 6A"}, |
192 | { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"}, | 192 | { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"}, |
193 | { TUNER_ABSENT, "Samsung TCPN 2121P30A"}, | 193 | { TUNER_SAMSUNG_TCPN_2121P30A, "Samsung TCPN 2121P30A"}, |
194 | { TUNER_ABSENT, "Samsung TCPE 4121P30A"}, | 194 | { TUNER_ABSENT, "Samsung TCPE 4121P30A"}, |
195 | { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"}, | 195 | { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"}, |
196 | /* 90-99 */ | 196 | /* 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 @@ | |||
115 | 115 | ||
116 | #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ | 116 | #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ |
117 | #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ | 117 | #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ |
118 | #define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */ | ||
118 | 119 | ||
119 | /* tv card specific */ | 120 | /* tv card specific */ |
120 | #define TDA9887_PRESENT (1<<0) | 121 | #define TDA9887_PRESENT (1<<0) |