aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-11-09 00:37:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:14 -0500
commitcf583ac40d06825bc850dc4f47627d7661aaa4f8 (patch)
treedd1686df5df4a99db8ae071475950cc3a883ad3a
parentf718e6e7a2c402195f3d2944605ef4b01e8e3347 (diff)
[PATCH] v4l: 711: changed pll 1 to pll pll 28
- Changed { .pll = 1, } to { .pll = PLL_28, } 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>
Diffstat
-rw-r--r--Documentation/video4linux/CARDLIST.bttv1
-rw-r--r--Documentation/video4linux/CARDLIST.cx881
-rw-r--r--drivers/media/video/bttv-cards.c4
-rw-r--r--drivers/media/video/bttv.h280
4 files changed, 144 insertions, 142 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index 1fde0d70da1d..ba98ff4a79af 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -138,3 +138,4 @@
138137 -> Conceptronic CTVFMi v2 138137 -> Conceptronic CTVFMi v2
139138 -> Prolink Pixelview PV-BT878P+ (Rev.2E) 139138 -> Prolink Pixelview PV-BT878P+ (Rev.2E)
140139 -> Prolink PixelView PlayTV MPEG2 PV-M4900 140139 -> Prolink PixelView PlayTV MPEG2 PV-M4900
141140 -> Osprey 440 [0070:ff07]
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index f0b3b49a4fdf..8a14e3f44ca2 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -31,3 +31,4 @@
31 30 -> TerraTec Cinergy 1400 DVB-T [153b:1166] 31 30 -> TerraTec Cinergy 1400 DVB-T [153b:1166]
32 31 -> DViCO FusionHDTV 5 Gold [18ac:d500] 32 31 -> DViCO FusionHDTV 5 Gold [18ac:d500]
33 32 -> AverMedia UltraTV Media Center PCI 550 [1461:8011] 33 32 -> AverMedia UltraTV Media Center PCI 550 [1461:8011]
34 33 -> Kworld V-Stream Xpert DVD
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 85f19426892b..1f33764bf050 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -1982,7 +1982,7 @@ struct tvcard bttv_tvcards[] = {
1982 .tuner_type = 5, 1982 .tuner_type = 5,
1983 .tuner_addr = ADDR_UNSET, 1983 .tuner_addr = ADDR_UNSET,
1984 .radio_addr = ADDR_UNSET, 1984 .radio_addr = ADDR_UNSET,
1985 .pll = 1, 1985 .pll = PLL_28,
1986 }, 1986 },
1987 [BTTV_BOARD_EURESYS_PICOLO] = { 1987 [BTTV_BOARD_EURESYS_PICOLO] = {
1988 .name = "Euresys Picolo", 1988 .name = "Euresys Picolo",
@@ -2765,7 +2765,7 @@ struct tvcard bttv_tvcards[] = {
2765 .has_radio = 1, 2765 .has_radio = 1,
2766 .has_remote = 1, 2766 .has_remote = 1,
2767 }, 2767 },
2768 /* ---- card 0x8c ---------------------------------- */ 2768 /* ---- card 0x8c ---------------------------------- */
2769 [BTTV_BOARD_OSPREY440] = { 2769 [BTTV_BOARD_OSPREY440] = {
2770 .name = "Osprey 440", 2770 .name = "Osprey 440",
2771 .video_inputs = 1, 2771 .video_inputs = 1,
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index 75d08a33b107..ffece3b91360 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bttv.h
@@ -20,147 +20,147 @@
20/* ---------------------------------------------------------- */ 20/* ---------------------------------------------------------- */
21/* exported by bttv-cards.c */ 21/* exported by bttv-cards.c */
22 22
23#define BTTV_BOARD_UNKNOWN 0x00 23#define BTTV_BOARD_UNKNOWN 0x00
24#define BTTV_BOARD_MIRO 0x01 24#define BTTV_BOARD_MIRO 0x01
25#define BTTV_BOARD_HAUPPAUGE 0x02 25#define BTTV_BOARD_HAUPPAUGE 0x02
26#define BTTV_BOARD_STB 0x03 26#define BTTV_BOARD_STB 0x03
27#define BTTV_BOARD_INTEL 0x04 27#define BTTV_BOARD_INTEL 0x04
28#define BTTV_BOARD_DIAMOND 0x05 28#define BTTV_BOARD_DIAMOND 0x05
29#define BTTV_BOARD_AVERMEDIA 0x06 29#define BTTV_BOARD_AVERMEDIA 0x06
30#define BTTV_BOARD_MATRIX_VISION 0x07 30#define BTTV_BOARD_MATRIX_VISION 0x07
31#define BTTV_BOARD_FLYVIDEO 0x08 31#define BTTV_BOARD_FLYVIDEO 0x08
32#define BTTV_BOARD_TURBOTV 0x09 32#define BTTV_BOARD_TURBOTV 0x09
33#define BTTV_BOARD_HAUPPAUGE878 0x0a 33#define BTTV_BOARD_HAUPPAUGE878 0x0a
34#define BTTV_BOARD_MIROPRO 0x0b 34#define BTTV_BOARD_MIROPRO 0x0b
35#define BTTV_BOARD_ADSTECH_TV 0x0c 35#define BTTV_BOARD_ADSTECH_TV 0x0c
36#define BTTV_BOARD_AVERMEDIA98 0x0d 36#define BTTV_BOARD_AVERMEDIA98 0x0d
37#define BTTV_BOARD_VHX 0x0e 37#define BTTV_BOARD_VHX 0x0e
38#define BTTV_BOARD_ZOLTRIX 0x0f 38#define BTTV_BOARD_ZOLTRIX 0x0f
39#define BTTV_BOARD_PIXVIEWPLAYTV 0x10 39#define BTTV_BOARD_PIXVIEWPLAYTV 0x10
40#define BTTV_BOARD_WINVIEW_601 0x11 40#define BTTV_BOARD_WINVIEW_601 0x11
41#define BTTV_BOARD_AVEC_INTERCAP 0x12 41#define BTTV_BOARD_AVEC_INTERCAP 0x12
42#define BTTV_BOARD_LIFE_FLYKIT 0x13 42#define BTTV_BOARD_LIFE_FLYKIT 0x13
43#define BTTV_BOARD_CEI_RAFFLES 0x14 43#define BTTV_BOARD_CEI_RAFFLES 0x14
44#define BTTV_BOARD_CONFERENCETV 0x15 44#define BTTV_BOARD_CONFERENCETV 0x15
45#define BTTV_BOARD_PHOEBE_TVMAS 0x16 45#define BTTV_BOARD_PHOEBE_TVMAS 0x16
46#define BTTV_BOARD_MODTEC_205 0x17 46#define BTTV_BOARD_MODTEC_205 0x17
47#define BTTV_BOARD_MAGICTVIEW061 0x18 47#define BTTV_BOARD_MAGICTVIEW061 0x18
48#define BTTV_BOARD_VOBIS_BOOSTAR 0x19 48#define BTTV_BOARD_VOBIS_BOOSTAR 0x19
49#define BTTV_BOARD_HAUPPAUG_WCAM 0x1a 49#define BTTV_BOARD_HAUPPAUG_WCAM 0x1a
50#define BTTV_BOARD_MAXI 0x1b 50#define BTTV_BOARD_MAXI 0x1b
51#define BTTV_BOARD_TERRATV 0x1c 51#define BTTV_BOARD_TERRATV 0x1c
52#define BTTV_BOARD_PXC200 0x1d 52#define BTTV_BOARD_PXC200 0x1d
53#define BTTV_BOARD_FLYVIDEO_98 0x1e 53#define BTTV_BOARD_FLYVIDEO_98 0x1e
54#define BTTV_BOARD_IPROTV 0x1f 54#define BTTV_BOARD_IPROTV 0x1f
55#define BTTV_BOARD_INTEL_C_S_PCI 0x20 55#define BTTV_BOARD_INTEL_C_S_PCI 0x20
56#define BTTV_BOARD_TERRATVALUE 0x21 56#define BTTV_BOARD_TERRATVALUE 0x21
57#define BTTV_BOARD_WINFAST2000 0x22 57#define BTTV_BOARD_WINFAST2000 0x22
58#define BTTV_BOARD_CHRONOS_VS2 0x23 58#define BTTV_BOARD_CHRONOS_VS2 0x23
59#define BTTV_BOARD_TYPHOON_TVIEW 0x24 59#define BTTV_BOARD_TYPHOON_TVIEW 0x24
60#define BTTV_BOARD_PXELVWPLTVPRO 0x25 60#define BTTV_BOARD_PXELVWPLTVPRO 0x25
61#define BTTV_BOARD_MAGICTVIEW063 0x26 61#define BTTV_BOARD_MAGICTVIEW063 0x26
62#define BTTV_BOARD_PINNACLE 0x27 62#define BTTV_BOARD_PINNACLE 0x27
63#define BTTV_BOARD_STB2 0x28 63#define BTTV_BOARD_STB2 0x28
64#define BTTV_BOARD_AVPHONE98 0x29 64#define BTTV_BOARD_AVPHONE98 0x29
65#define BTTV_BOARD_PV951 0x2a 65#define BTTV_BOARD_PV951 0x2a
66#define BTTV_BOARD_ONAIR_TV 0x2b 66#define BTTV_BOARD_ONAIR_TV 0x2b
67#define BTTV_BOARD_SIGMA_TVII_FM 0x2c 67#define BTTV_BOARD_SIGMA_TVII_FM 0x2c
68#define BTTV_BOARD_MATRIX_VISION2 0x2d 68#define BTTV_BOARD_MATRIX_VISION2 0x2d
69#define BTTV_BOARD_ZOLTRIX_GENIE 0x2e 69#define BTTV_BOARD_ZOLTRIX_GENIE 0x2e
70#define BTTV_BOARD_TERRATVRADIO 0x2f 70#define BTTV_BOARD_TERRATVRADIO 0x2f
71#define BTTV_BOARD_DYNALINK 0x30 71#define BTTV_BOARD_DYNALINK 0x30
72#define BTTV_BOARD_GVBCTV3PCI 0x31 72#define BTTV_BOARD_GVBCTV3PCI 0x31
73#define BTTV_BOARD_PXELVWPLTVPAK 0x32 73#define BTTV_BOARD_PXELVWPLTVPAK 0x32
74#define BTTV_BOARD_EAGLE 0x33 74#define BTTV_BOARD_EAGLE 0x33
75#define BTTV_BOARD_PINNACLEPRO 0x34 75#define BTTV_BOARD_PINNACLEPRO 0x34
76#define BTTV_BOARD_TVIEW_RDS_FM 0x35 76#define BTTV_BOARD_TVIEW_RDS_FM 0x35
77#define BTTV_BOARD_LIFETEC_9415 0x36 77#define BTTV_BOARD_LIFETEC_9415 0x36
78#define BTTV_BOARD_BESTBUY_EASYTV 0x37 78#define BTTV_BOARD_BESTBUY_EASYTV 0x37
79#define BTTV_BOARD_FLYVIDEO_98FM 0x38 79#define BTTV_BOARD_FLYVIDEO_98FM 0x38
80#define BTTV_BOARD_GRANDTEC 0x39 80#define BTTV_BOARD_GRANDTEC 0x39
81#define BTTV_BOARD_ASKEY_CPH060 0x3a 81#define BTTV_BOARD_ASKEY_CPH060 0x3a
82#define BTTV_BOARD_ASKEY_CPH03X 0x3b 82#define BTTV_BOARD_ASKEY_CPH03X 0x3b
83#define BTTV_BOARD_MM100PCTV 0x3c 83#define BTTV_BOARD_MM100PCTV 0x3c
84#define BTTV_BOARD_GMV1 0x3d 84#define BTTV_BOARD_GMV1 0x3d
85#define BTTV_BOARD_BESTBUY_EASYTV2 0x3e 85#define BTTV_BOARD_BESTBUY_EASYTV2 0x3e
86#define BTTV_BOARD_ATI_TVWONDER 0x3f 86#define BTTV_BOARD_ATI_TVWONDER 0x3f
87#define BTTV_BOARD_ATI_TVWONDERVE 0x40 87#define BTTV_BOARD_ATI_TVWONDERVE 0x40
88#define BTTV_BOARD_FLYVIDEO2000 0x41 88#define BTTV_BOARD_FLYVIDEO2000 0x41
89#define BTTV_BOARD_TERRATVALUER 0x42 89#define BTTV_BOARD_TERRATVALUER 0x42
90#define BTTV_BOARD_GVBCTV4PCI 0x43 90#define BTTV_BOARD_GVBCTV4PCI 0x43
91#define BTTV_BOARD_VOODOOTV_FM 0x44 91#define BTTV_BOARD_VOODOOTV_FM 0x44
92#define BTTV_BOARD_AIMMS 0x45 92#define BTTV_BOARD_AIMMS 0x45
93#define BTTV_BOARD_PV_BT878P_PLUS 0x46 93#define BTTV_BOARD_PV_BT878P_PLUS 0x46
94#define BTTV_BOARD_FLYVIDEO98EZ 0x47 94#define BTTV_BOARD_FLYVIDEO98EZ 0x47
95#define BTTV_BOARD_PV_BT878P_9B 0x48 95#define BTTV_BOARD_PV_BT878P_9B 0x48
96#define BTTV_BOARD_SENSORAY311 0x49 96#define BTTV_BOARD_SENSORAY311 0x49
97#define BTTV_BOARD_RV605 0x4a 97#define BTTV_BOARD_RV605 0x4a
98#define BTTV_BOARD_POWERCLR_MTV878 0x4b 98#define BTTV_BOARD_POWERCLR_MTV878 0x4b
99#define BTTV_BOARD_WINDVR 0x4c 99#define BTTV_BOARD_WINDVR 0x4c
100#define BTTV_BOARD_GRANDTEC_MULTI 0x4d 100#define BTTV_BOARD_GRANDTEC_MULTI 0x4d
101#define BTTV_BOARD_KWORLD 0x4e 101#define BTTV_BOARD_KWORLD 0x4e
102#define BTTV_BOARD_DSP_TCVIDEO 0x4f 102#define BTTV_BOARD_DSP_TCVIDEO 0x4f
103#define BTTV_BOARD_HAUPPAUGEPVR 0x50 103#define BTTV_BOARD_HAUPPAUGEPVR 0x50
104#define BTTV_BOARD_GVBCTV5PCI 0x51 104#define BTTV_BOARD_GVBCTV5PCI 0x51
105#define BTTV_BOARD_OSPREY1x0 0x52 105#define BTTV_BOARD_OSPREY1x0 0x52
106#define BTTV_BOARD_OSPREY1x0_848 0x53 106#define BTTV_BOARD_OSPREY1x0_848 0x53
107#define BTTV_BOARD_OSPREY101_848 0x54 107#define BTTV_BOARD_OSPREY101_848 0x54
108#define BTTV_BOARD_OSPREY1x1 0x55 108#define BTTV_BOARD_OSPREY1x1 0x55
109#define BTTV_BOARD_OSPREY1x1_SVID 0x56 109#define BTTV_BOARD_OSPREY1x1_SVID 0x56
110#define BTTV_BOARD_OSPREY2xx 0x57 110#define BTTV_BOARD_OSPREY2xx 0x57
111#define BTTV_BOARD_OSPREY2x0_SVID 0x58 111#define BTTV_BOARD_OSPREY2x0_SVID 0x58
112#define BTTV_BOARD_OSPREY2x0 0x59 112#define BTTV_BOARD_OSPREY2x0 0x59
113#define BTTV_BOARD_OSPREY500 0x5a 113#define BTTV_BOARD_OSPREY500 0x5a
114#define BTTV_BOARD_OSPREY540 0x5b 114#define BTTV_BOARD_OSPREY540 0x5b
115#define BTTV_BOARD_OSPREY2000 0x5c 115#define BTTV_BOARD_OSPREY2000 0x5c
116#define BTTV_BOARD_IDS_EAGLE 0x5d 116#define BTTV_BOARD_IDS_EAGLE 0x5d
117#define BTTV_BOARD_PINNACLESAT 0x5e 117#define BTTV_BOARD_PINNACLESAT 0x5e
118#define BTTV_BOARD_FORMAC_PROTV 0x5f 118#define BTTV_BOARD_FORMAC_PROTV 0x5f
119#define BTTV_BOARD_MACHTV 0x60 119#define BTTV_BOARD_MACHTV 0x60
120#define BTTV_BOARD_EURESYS_PICOLO 0x61 120#define BTTV_BOARD_EURESYS_PICOLO 0x61
121#define BTTV_BOARD_PV150 0x62 121#define BTTV_BOARD_PV150 0x62
122#define BTTV_BOARD_AD_TVK503 0x63 122#define BTTV_BOARD_AD_TVK503 0x63
123#define BTTV_BOARD_HERCULES_SM_TV 0x64 123#define BTTV_BOARD_HERCULES_SM_TV 0x64
124#define BTTV_BOARD_PACETV 0x65 124#define BTTV_BOARD_PACETV 0x65
125#define BTTV_BOARD_IVC200 0x66 125#define BTTV_BOARD_IVC200 0x66
126#define BTTV_BOARD_XGUARD 0x67 126#define BTTV_BOARD_XGUARD 0x67
127#define BTTV_BOARD_NEBULA_DIGITV 0x68 127#define BTTV_BOARD_NEBULA_DIGITV 0x68
128#define BTTV_BOARD_PV143 0x69 128#define BTTV_BOARD_PV143 0x69
129#define BTTV_BOARD_VD009X1_MINIDIN 0x6a 129#define BTTV_BOARD_VD009X1_MINIDIN 0x6a
130#define BTTV_BOARD_VD009X1_COMBI 0x6b 130#define BTTV_BOARD_VD009X1_COMBI 0x6b
131#define BTTV_BOARD_VD009_MINIDIN 0x6c 131#define BTTV_BOARD_VD009_MINIDIN 0x6c
132#define BTTV_BOARD_VD009_COMBI 0x6d 132#define BTTV_BOARD_VD009_COMBI 0x6d
133#define BTTV_BOARD_IVC100 0x6e 133#define BTTV_BOARD_IVC100 0x6e
134#define BTTV_BOARD_IVC120 0x6f 134#define BTTV_BOARD_IVC120 0x6f
135#define BTTV_BOARD_PC_HDTV 0x70 135#define BTTV_BOARD_PC_HDTV 0x70
136#define BTTV_BOARD_TWINHAN_DST 0x71 136#define BTTV_BOARD_TWINHAN_DST 0x71
137#define BTTV_BOARD_WINFASTVC100 0x72 137#define BTTV_BOARD_WINFASTVC100 0x72
138#define BTTV_BOARD_TEV560 0x73 138#define BTTV_BOARD_TEV560 0x73
139#define BTTV_BOARD_SIMUS_GVC1100 0x74 139#define BTTV_BOARD_SIMUS_GVC1100 0x74
140#define BTTV_BOARD_NGSTV_PLUS 0x75 140#define BTTV_BOARD_NGSTV_PLUS 0x75
141#define BTTV_BOARD_LMLBT4 0x76 141#define BTTV_BOARD_LMLBT4 0x76
142#define BTTV_BOARD_TEKRAM_M205 0x77 142#define BTTV_BOARD_TEKRAM_M205 0x77
143#define BTTV_BOARD_CONTVFMI 0x78 143#define BTTV_BOARD_CONTVFMI 0x78
144#define BTTV_BOARD_PICOLO_TETRA_CHIP 0x79 144#define BTTV_BOARD_PICOLO_TETRA_CHIP 0x79
145#define BTTV_BOARD_SPIRIT_TV 0x7a 145#define BTTV_BOARD_SPIRIT_TV 0x7a
146#define BTTV_BOARD_AVDVBT_771 0x7b 146#define BTTV_BOARD_AVDVBT_771 0x7b
147#define BTTV_BOARD_AVDVBT_761 0x7c 147#define BTTV_BOARD_AVDVBT_761 0x7c
148#define BTTV_BOARD_MATRIX_VISIONSQ 0x7d 148#define BTTV_BOARD_MATRIX_VISIONSQ 0x7d
149#define BTTV_BOARD_MATRIX_VISIONSLC 0x7e 149#define BTTV_BOARD_MATRIX_VISIONSLC 0x7e
150#define BTTV_BOARD_APAC_VIEWCOMP 0x7f 150#define BTTV_BOARD_APAC_VIEWCOMP 0x7f
151#define BTTV_BOARD_DVICO_DVBT_LITE 0x80 151#define BTTV_BOARD_DVICO_DVBT_LITE 0x80
152#define BTTV_BOARD_VGEAR_MYVCD 0x81 152#define BTTV_BOARD_VGEAR_MYVCD 0x81
153#define BTTV_BOARD_SUPER_TV 0x82 153#define BTTV_BOARD_SUPER_TV 0x82
154#define BTTV_BOARD_TIBET_CS16 0x83 154#define BTTV_BOARD_TIBET_CS16 0x83
155#define BTTV_BOARD_KODICOM_4400R 0x84 155#define BTTV_BOARD_KODICOM_4400R 0x84
156#define BTTV_BOARD_KODICOM_4400R_SL 0x85 156#define BTTV_BOARD_KODICOM_4400R_SL 0x85
157#define BTTV_BOARD_ADLINK_RTV24 0x86 157#define BTTV_BOARD_ADLINK_RTV24 0x86
158#define BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE 0x87 158#define BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE 0x87
159#define BTTV_BOARD_ACORP_Y878F 0x88 159#define BTTV_BOARD_ACORP_Y878F 0x88
160#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89 160#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89
161#define BTTV_BOARD_PV_BT878P_2E 0x8a 161#define BTTV_BOARD_PV_BT878P_2E 0x8a
162#define BTTV_BOARD_PV_M4900 0x8b 162#define BTTV_BOARD_PV_M4900 0x8b
163#define BTTV_BOARD_OSPREY440 0x8c 163#define BTTV_BOARD_OSPREY440 0x8c
164 164
165/* i2c address list */ 165/* i2c address list */
166#define I2C_TSA5522 0xc2 166#define I2C_TSA5522 0xc2
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 14:09:22 -0500