diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.bttv | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 24 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index e17750473e08..f11c583295e9 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv | |||
@@ -157,3 +157,4 @@ | |||
157 | 156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050] | 157 | 156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050] |
158 | 157 -> Geovision GV-800(S) (master) [800a:763d] | 158 | 157 -> Geovision GV-800(S) (master) [800a:763d] |
159 | 158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d] | 159 | 158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d] |
160 | 159 -> ProVideo PV183 [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540] | ||
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 7725d9487abf..1536ab5a4a8d 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -320,6 +320,16 @@ static struct CARD { | |||
320 | { 0x763d800b, BTTV_BOARD_GEOVISION_GV800S_SL, "GeoVision GV-800(S) (slave)" }, | 320 | { 0x763d800b, BTTV_BOARD_GEOVISION_GV800S_SL, "GeoVision GV-800(S) (slave)" }, |
321 | { 0x763d800c, BTTV_BOARD_GEOVISION_GV800S_SL, "GeoVision GV-800(S) (slave)" }, | 321 | { 0x763d800c, BTTV_BOARD_GEOVISION_GV800S_SL, "GeoVision GV-800(S) (slave)" }, |
322 | { 0x763d800d, BTTV_BOARD_GEOVISION_GV800S_SL, "GeoVision GV-800(S) (slave)" }, | 322 | { 0x763d800d, BTTV_BOARD_GEOVISION_GV800S_SL, "GeoVision GV-800(S) (slave)" }, |
323 | |||
324 | { 0x15401830, BTTV_BOARD_PV183, "Provideo PV183-1" }, | ||
325 | { 0x15401831, BTTV_BOARD_PV183, "Provideo PV183-2" }, | ||
326 | { 0x15401832, BTTV_BOARD_PV183, "Provideo PV183-3" }, | ||
327 | { 0x15401833, BTTV_BOARD_PV183, "Provideo PV183-4" }, | ||
328 | { 0x15401834, BTTV_BOARD_PV183, "Provideo PV183-5" }, | ||
329 | { 0x15401835, BTTV_BOARD_PV183, "Provideo PV183-6" }, | ||
330 | { 0x15401836, BTTV_BOARD_PV183, "Provideo PV183-7" }, | ||
331 | { 0x15401837, BTTV_BOARD_PV183, "Provideo PV183-8" }, | ||
332 | |||
323 | { 0, -1, NULL } | 333 | { 0, -1, NULL } |
324 | }; | 334 | }; |
325 | 335 | ||
@@ -2881,6 +2891,20 @@ struct tvcard bttv_tvcards[] = { | |||
2881 | .no_tda9875 = 1, | 2891 | .no_tda9875 = 1, |
2882 | .muxsel_hook = gv800s_muxsel, | 2892 | .muxsel_hook = gv800s_muxsel, |
2883 | }, | 2893 | }, |
2894 | [BTTV_BOARD_PV183] = { | ||
2895 | .name = "ProVideo PV183", /* 0x9f */ | ||
2896 | .video_inputs = 2, | ||
2897 | /* .audio_inputs= 0, */ | ||
2898 | .svhs = NO_SVHS, | ||
2899 | .gpiomask = 0, | ||
2900 | .muxsel = MUXSEL(2, 3), | ||
2901 | .gpiomux = { 0 }, | ||
2902 | .needs_tvaudio = 0, | ||
2903 | .no_msp34xx = 1, | ||
2904 | .pll = PLL_28, | ||
2905 | .tuner_type = TUNER_ABSENT, | ||
2906 | .tuner_addr = ADDR_UNSET, | ||
2907 | }, | ||
2884 | }; | 2908 | }; |
2885 | 2909 | ||
2886 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); | 2910 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 85b0e3e9d382..fac5f86356d2 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -184,6 +184,7 @@ | |||
184 | #define BTTV_BOARD_IVCE8784 0x9c | 184 | #define BTTV_BOARD_IVCE8784 0x9c |
185 | #define BTTV_BOARD_GEOVISION_GV800S 0x9d | 185 | #define BTTV_BOARD_GEOVISION_GV800S 0x9d |
186 | #define BTTV_BOARD_GEOVISION_GV800S_SL 0x9e | 186 | #define BTTV_BOARD_GEOVISION_GV800S_SL 0x9e |
187 | #define BTTV_BOARD_PV183 0x9f | ||
187 | 188 | ||
188 | 189 | ||
189 | /* more card-specific defines */ | 190 | /* more card-specific defines */ |