diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 16 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index d476f8e15bae..d2688c71c657 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -77,3 +77,4 @@ | |||
77 | 76 -> SKNet MonsterTV Mobile [1131:4ee9] | 77 | 76 -> SKNet MonsterTV Mobile [1131:4ee9] |
78 | 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] | 78 | 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] |
79 | 78 -> ASUSTeK P7131 Dual [1043:4862] | 79 | 78 -> ASUSTeK P7131 Dual [1043:4862] |
80 | 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B) | ||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 155a66b3a2d2..d16d7c4cd851 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2446,6 +2446,21 @@ struct saa7134_board saa7134_boards[] = { | |||
2446 | .gpio = 0x0200000, | 2446 | .gpio = 0x0200000, |
2447 | }, | 2447 | }, |
2448 | }, | 2448 | }, |
2449 | [SAA7134_BOARD_PCTV_CARDBUS] = { | ||
2450 | /* Paul Tom Zalac <pzalac@gmail.com> */ | ||
2451 | /* tda8275a tuner doesnt work yet */ | ||
2452 | .name = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)", | ||
2453 | .audio_clock = 0x00187de7, | ||
2454 | .tuner_type = TUNER_ABSENT, | ||
2455 | .radio_type = UNSET, | ||
2456 | .tuner_addr = ADDR_UNSET, | ||
2457 | .radio_addr = ADDR_UNSET, | ||
2458 | .inputs = {{ | ||
2459 | .name = name_comp1, | ||
2460 | .vmux = 1, | ||
2461 | .amux = LINE2, | ||
2462 | }}, | ||
2463 | }, | ||
2449 | }; | 2464 | }; |
2450 | 2465 | ||
2451 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 2466 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -2973,6 +2988,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
2973 | case SAA7134_BOARD_AVACSSMARTTV: | 2988 | case SAA7134_BOARD_AVACSSMARTTV: |
2974 | case SAA7134_BOARD_GOTVIEW_7135: | 2989 | case SAA7134_BOARD_GOTVIEW_7135: |
2975 | case SAA7134_BOARD_KWORLD_TERMINATOR: | 2990 | case SAA7134_BOARD_KWORLD_TERMINATOR: |
2991 | case SAA7134_BOARD_PCTV_CARDBUS: | ||
2976 | dev->has_remote = 1; | 2992 | dev->has_remote = 1; |
2977 | break; | 2993 | break; |
2978 | case SAA7134_BOARD_MD5044: | 2994 | case SAA7134_BOARD_MD5044: |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index ae89a3368ffe..768370041067 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -206,6 +206,7 @@ struct saa7134_format { | |||
206 | #define SAA7134_BOARD_MONSTERTV_MOBILE 76 | 206 | #define SAA7134_BOARD_MONSTERTV_MOBILE 76 |
207 | #define SAA7134_BOARD_PINNACLE_PCTV_110i 77 | 207 | #define SAA7134_BOARD_PINNACLE_PCTV_110i 77 |
208 | #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 | 208 | #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 |
209 | #define SAA7134_BOARD_PCTV_CARDBUS 79 | ||
209 | 210 | ||
210 | #define SAA7134_MAXBOARDS 8 | 211 | #define SAA7134_MAXBOARDS 8 |
211 | #define SAA7134_INPUT_MAX 8 | 212 | #define SAA7134_INPUT_MAX 8 |