diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-09-09 16:03:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:50 -0400 |
commit | 260784dcca44b5a526cece1f275cb81ccd186a3e (patch) | |
tree | 5617e2d03ef3c653866dfed25b76deabb04bea65 /drivers/media | |
parent | 5adc1c306b1ce5b297bd8ee010a62f39cd32b9e4 (diff) |
[PATCH] v4l: add saa713x card #65 Kworld V-Stream Studio TV Terminator
- Add saa713x card #65 Kworld V-Stream Studio TV Terminator
Signed-off-by: James R Webb <jrwebb@qwest.net>
Signed-off-by: Peter Missel <peter.missel@onlinehome.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 33 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index c277b3b46512..ea0237a0b563 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2035,6 +2035,39 @@ struct saa7134_board saa7134_boards[] = { | |||
2035 | .amux = LINE2, | 2035 | .amux = LINE2, |
2036 | }, | 2036 | }, |
2037 | }, | 2037 | }, |
2038 | [SAA7134_BOARD_KWORLD_TERMINATOR] = { | ||
2039 | /* Kworld V-Stream Studio TV Terminator */ | ||
2040 | /* "James Webb <jrwebb@qwest.net> */ | ||
2041 | .name = "V-Stream Studio TV Terminator", | ||
2042 | .audio_clock = 0x00187de7, | ||
2043 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
2044 | .radio_type = UNSET, | ||
2045 | .tuner_addr = ADDR_UNSET, | ||
2046 | .radio_addr = ADDR_UNSET, | ||
2047 | .gpiomask = 1 << 21, | ||
2048 | .inputs = {{ | ||
2049 | .name = name_tv, | ||
2050 | .vmux = 1, | ||
2051 | .amux = TV, | ||
2052 | .gpio = 0x0000000, | ||
2053 | .tv = 1, | ||
2054 | },{ | ||
2055 | .name = name_comp1, /* Composite input */ | ||
2056 | .vmux = 3, | ||
2057 | .amux = LINE2, | ||
2058 | .gpio = 0x0000000, | ||
2059 | },{ | ||
2060 | .name = name_svideo, /* S-Video input */ | ||
2061 | .vmux = 8, | ||
2062 | .amux = LINE2, | ||
2063 | .gpio = 0x0000000, | ||
2064 | }}, | ||
2065 | .radio = { | ||
2066 | .name = name_radio, | ||
2067 | .amux = TV, | ||
2068 | .gpio = 0x0200000, | ||
2069 | }, | ||
2070 | }, | ||
2038 | }; | 2071 | }; |
2039 | 2072 | ||
2040 | 2073 | ||
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 7a7fa42e1d22..26ec9446dff5 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -185,6 +185,7 @@ struct saa7134_format { | |||
185 | #define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62 | 185 | #define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62 |
186 | #define SAA7134_BOARD_KWORLD_XPERT 63 | 186 | #define SAA7134_BOARD_KWORLD_XPERT 63 |
187 | #define SAA7134_BOARD_FLYTV_DIGIMATRIX 64 | 187 | #define SAA7134_BOARD_FLYTV_DIGIMATRIX 64 |
188 | #define SAA7134_BOARD_KWORLD_TERMINATOR 65 | ||
188 | 189 | ||
189 | #define SAA7134_MAXBOARDS 8 | 190 | #define SAA7134_MAXBOARDS 8 |
190 | #define SAA7134_INPUT_MAX 8 | 191 | #define SAA7134_INPUT_MAX 8 |