aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul T Zalac <pzalac@gmail.com>2005-11-08 21:38:04 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:23 -0800
commitfe2e36c8cdc81bea8edf7d0408a1f49da01e16ee (patch)
tree8743260a5fbdd5fcfeb5b31f24451dbd0b1a9e65
parent28f0224170c4d8115383f56985575a42ed8b4dc1 (diff)
[PATCH] v4l: 834: add card pctv cardbus tv radio ito25 rev 2b
- Add card: PCTV Cardbus TV/Radio (ITO25 Rev:2B) Signed-off-by: Paul T Zalac <pzalac@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71341
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c16
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
3 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index d476f8e15ba..d2688c71c65 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -77,3 +77,4 @@
76 -> SKNet MonsterTV Mobile [1131:4ee9]
77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e]
78 -> ASUSTeK P7131 Dual [1043:4862]
+ 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 155a66b3a2d..d16d7c4cd85 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[] = {
.gpio = 0x0200000,
},
},
+ [SAA7134_BOARD_PCTV_CARDBUS] = {
+ /* Paul Tom Zalac <pzalac@gmail.com> */
+ /* tda8275a tuner doesnt work yet */
+ .name = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)",
+ .audio_clock = 0x00187de7,
+ .tuner_type = TUNER_ABSENT,
+ .radio_type = UNSET,
+ .tuner_addr = ADDR_UNSET,
+ .radio_addr = ADDR_UNSET,
+ .inputs = {{
+ .name = name_comp1,
+ .vmux = 1,
+ .amux = LINE2,
+ }},
+ },
};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2973,6 +2988,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_AVACSSMARTTV:
case SAA7134_BOARD_GOTVIEW_7135:
case SAA7134_BOARD_KWORLD_TERMINATOR:
+ case SAA7134_BOARD_PCTV_CARDBUS:
dev->has_remote = 1;
break;
case SAA7134_BOARD_MD5044:
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index ae89a3368ff..76837004106 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -206,6 +206,7 @@ struct saa7134_format {
#define SAA7134_BOARD_MONSTERTV_MOBILE 76
#define SAA7134_BOARD_PINNACLE_PCTV_110i 77
#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
+#define SAA7134_BOARD_PCTV_CARDBUS 79
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8