diff options
author | Lubomir Bulej <bulej@nenya.ms.mff.cuni.cz> | 2005-11-09 00:38:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:29 -0500 |
commit | 7418f3462aedf6fb962a44c8fa7259dd94530ff5 (patch) | |
tree | 97e8f42d3a11d8c4d2aaf2e89061e621a25a3550 /drivers/media/video/cx88 | |
parent | 6e45f5d8d27cb619cf7e94c78a67fb61a4f3dd5e (diff) |
[PATCH] v4l: 895: new avermedia 303 card without radio
- New Avermedia 303 card (without radio).
Signed-off-by: Lubomir Bulej <bulej@nenya.ms.mff.cuni.cz>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
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>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 38 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 3 |
2 files changed, 38 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index f20984eb5538..f2268631b7c0 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -174,7 +174,7 @@ struct cx88_board cx88_boards[] = { | |||
174 | .gpio3 = 0x02000000, | 174 | .gpio3 = 0x02000000, |
175 | }, | 175 | }, |
176 | }, | 176 | }, |
177 | [CX88_BOARD_AVERTV_303] = { | 177 | [CX88_BOARD_AVERTV_STUDIO_303] = { |
178 | .name = "AverTV Studio 303 (M126)", | 178 | .name = "AverTV Studio 303 (M126)", |
179 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | 179 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
180 | .radio_type = UNSET, | 180 | .radio_type = UNSET, |
@@ -865,6 +865,36 @@ struct cx88_board cx88_boards[] = { | |||
865 | }}, | 865 | }}, |
866 | .dvb = 1, | 866 | .dvb = 1, |
867 | }, | 867 | }, |
868 | [CX88_BOARD_AVERTV_303] = { | ||
869 | .name = "AVerTV 303 (M126)", | ||
870 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
871 | .radio_type = UNSET, | ||
872 | .tuner_addr = ADDR_UNSET, | ||
873 | .radio_addr = ADDR_UNSET, | ||
874 | .tda9887_conf = TDA9887_PRESENT, | ||
875 | .input = {{ | ||
876 | .type = CX88_VMUX_TELEVISION, | ||
877 | .vmux = 0, | ||
878 | .gpio0 = 0x00ff, | ||
879 | .gpio1 = 0xe09f, | ||
880 | .gpio2 = 0x0010, | ||
881 | .gpio3 = 0x0000, | ||
882 | },{ | ||
883 | .type = CX88_VMUX_COMPOSITE1, | ||
884 | .vmux = 1, | ||
885 | .gpio0 = 0x00ff, | ||
886 | .gpio1 = 0xe05f, | ||
887 | .gpio2 = 0x0010, | ||
888 | .gpio3 = 0x0000, | ||
889 | },{ | ||
890 | .type = CX88_VMUX_SVIDEO, | ||
891 | .vmux = 2, | ||
892 | .gpio0 = 0x00ff, | ||
893 | .gpio1 = 0xe05f, | ||
894 | .gpio2 = 0x0010, | ||
895 | .gpio3 = 0x0000, | ||
896 | }}, | ||
897 | }, | ||
868 | }; | 898 | }; |
869 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 899 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
870 | 900 | ||
@@ -915,7 +945,7 @@ struct cx88_subid cx88_subids[] = { | |||
915 | },{ | 945 | },{ |
916 | .subvendor = 0x1461, | 946 | .subvendor = 0x1461, |
917 | .subdevice = 0x000b, | 947 | .subdevice = 0x000b, |
918 | .card = CX88_BOARD_AVERTV_303, | 948 | .card = CX88_BOARD_AVERTV_STUDIO_303, |
919 | },{ | 949 | },{ |
920 | .subvendor = 0x1462, | 950 | .subvendor = 0x1462, |
921 | .subdevice = 0x8606, | 951 | .subdevice = 0x8606, |
@@ -1008,6 +1038,10 @@ struct cx88_subid cx88_subids[] = { | |||
1008 | .subvendor = 0x107d, | 1038 | .subvendor = 0x107d, |
1009 | .subdevice = 0x665f, | 1039 | .subdevice = 0x665f, |
1010 | .card = CX88_BOARD_WINFAST_DTV1000, | 1040 | .card = CX88_BOARD_WINFAST_DTV1000, |
1041 | },{ | ||
1042 | .subvendor = 0x1461, | ||
1043 | .subdevice = 0x000a, | ||
1044 | .card = CX88_BOARD_AVERTV_303, | ||
1011 | }, | 1045 | }, |
1012 | }; | 1046 | }; |
1013 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); | 1047 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index baeae1ac992c..b19d3a9e2298 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -148,7 +148,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
148 | #define CX88_BOARD_PIXELVIEW 3 | 148 | #define CX88_BOARD_PIXELVIEW 3 |
149 | #define CX88_BOARD_ATI_WONDER_PRO 4 | 149 | #define CX88_BOARD_ATI_WONDER_PRO 4 |
150 | #define CX88_BOARD_WINFAST2000XP_EXPERT 5 | 150 | #define CX88_BOARD_WINFAST2000XP_EXPERT 5 |
151 | #define CX88_BOARD_AVERTV_303 6 | 151 | #define CX88_BOARD_AVERTV_STUDIO_303 6 |
152 | #define CX88_BOARD_MSI_TVANYWHERE_MASTER 7 | 152 | #define CX88_BOARD_MSI_TVANYWHERE_MASTER 7 |
153 | #define CX88_BOARD_WINFAST_DV2000 8 | 153 | #define CX88_BOARD_WINFAST_DV2000 8 |
154 | #define CX88_BOARD_LEADTEK_PVR2000 9 | 154 | #define CX88_BOARD_LEADTEK_PVR2000 9 |
@@ -178,6 +178,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
178 | #define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33 | 178 | #define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33 |
179 | #define CX88_BOARD_ATI_HDTVWONDER 34 | 179 | #define CX88_BOARD_ATI_HDTVWONDER 34 |
180 | #define CX88_BOARD_WINFAST_DTV1000 35 | 180 | #define CX88_BOARD_WINFAST_DTV1000 35 |
181 | #define CX88_BOARD_AVERTV_303 36 | ||
181 | 182 | ||
182 | enum cx88_itype { | 183 | enum cx88_itype { |
183 | CX88_VMUX_COMPOSITE1 = 1, | 184 | CX88_VMUX_COMPOSITE1 = 1, |