summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-06-24 08:37:43 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-06-24 08:37:43 -0400
commit123818ee8c401d62af272e139c7ca04ee886f720 (patch)
tree158a72fbf8528cca2d4f1d94e1e57ad92ed9401d /drivers
parent804c7812effb9e0a5ce580567308d652379cb367 (diff)
m5602_ov7660: move skeletons to the .c file
The header file has some private static structures that are used only by the C file. Move those structures to the C file, in order to shut up gcc 6.1 warnings. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/usb/gspca/m5602/m5602_ov7660.c153
-rw-r--r--drivers/media/usb/gspca/m5602/m5602_ov7660.h153
2 files changed, 153 insertions, 153 deletions
diff --git a/drivers/media/usb/gspca/m5602/m5602_ov7660.c b/drivers/media/usb/gspca/m5602/m5602_ov7660.c
index 64b3b03a9141..672b7a520695 100644
--- a/drivers/media/usb/gspca/m5602/m5602_ov7660.c
+++ b/drivers/media/usb/gspca/m5602/m5602_ov7660.c
@@ -23,6 +23,159 @@
23static int ov7660_s_ctrl(struct v4l2_ctrl *ctrl); 23static int ov7660_s_ctrl(struct v4l2_ctrl *ctrl);
24static void ov7660_dump_registers(struct sd *sd); 24static void ov7660_dump_registers(struct sd *sd);
25 25
26static const unsigned char preinit_ov7660[][4] = {
27 {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
28 {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
29 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
30 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
31 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
32 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
33 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
34 {BRIDGE, M5602_XB_GPIO_DIR, 0x03},
35 {BRIDGE, M5602_XB_GPIO_DIR, 0x03},
36 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
37 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
38
39 {SENSOR, OV7660_OFON, 0x0c},
40 {SENSOR, OV7660_COM2, 0x11},
41 {SENSOR, OV7660_COM7, 0x05},
42
43 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
44 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
45 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
46 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
47 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
48 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
49 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
50 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
51 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
52 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
53 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
54 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
55 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
56 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
57 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00}
58};
59
60static const unsigned char init_ov7660[][4] = {
61 {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
62 {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
63 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
64 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
65 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
66 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
67 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
68 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
69 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
70 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
71 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
72 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
73 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
74 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
75 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
76 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
77 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
78 {SENSOR, OV7660_COM7, 0x80},
79 {SENSOR, OV7660_CLKRC, 0x80},
80 {SENSOR, OV7660_COM9, 0x4c},
81 {SENSOR, OV7660_OFON, 0x43},
82 {SENSOR, OV7660_COM12, 0x28},
83 {SENSOR, OV7660_COM8, 0x00},
84 {SENSOR, OV7660_COM10, 0x40},
85 {SENSOR, OV7660_HSTART, 0x0c},
86 {SENSOR, OV7660_HSTOP, 0x61},
87 {SENSOR, OV7660_HREF, 0xa4},
88 {SENSOR, OV7660_PSHFT, 0x0b},
89 {SENSOR, OV7660_VSTART, 0x01},
90 {SENSOR, OV7660_VSTOP, 0x7a},
91 {SENSOR, OV7660_VSTOP, 0x00},
92 {SENSOR, OV7660_COM7, 0x05},
93 {SENSOR, OV7660_COM6, 0x42},
94 {SENSOR, OV7660_BBIAS, 0x94},
95 {SENSOR, OV7660_GbBIAS, 0x94},
96 {SENSOR, OV7660_RSVD29, 0x94},
97 {SENSOR, OV7660_RBIAS, 0x94},
98 {SENSOR, OV7660_COM1, 0x00},
99 {SENSOR, OV7660_AECH, 0x00},
100 {SENSOR, OV7660_AECHH, 0x00},
101 {SENSOR, OV7660_ADC, 0x05},
102 {SENSOR, OV7660_COM13, 0x00},
103 {SENSOR, OV7660_RSVDA1, 0x23},
104 {SENSOR, OV7660_TSLB, 0x0d},
105 {SENSOR, OV7660_HV, 0x80},
106 {SENSOR, OV7660_LCC1, 0x00},
107 {SENSOR, OV7660_LCC2, 0x00},
108 {SENSOR, OV7660_LCC3, 0x10},
109 {SENSOR, OV7660_LCC4, 0x40},
110 {SENSOR, OV7660_LCC5, 0x01},
111
112 {SENSOR, OV7660_AECH, 0x20},
113 {SENSOR, OV7660_COM1, 0x00},
114 {SENSOR, OV7660_OFON, 0x0c},
115 {SENSOR, OV7660_COM2, 0x11},
116 {SENSOR, OV7660_COM7, 0x05},
117 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
118 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
119 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
120 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
121 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
122 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
123 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
124 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
125 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
126 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
127 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
128 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
129 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
130 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
131 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
132 {SENSOR, OV7660_AECH, 0x5f},
133 {SENSOR, OV7660_COM1, 0x03},
134 {SENSOR, OV7660_OFON, 0x0c},
135 {SENSOR, OV7660_COM2, 0x11},
136 {SENSOR, OV7660_COM7, 0x05},
137 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
138 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
139 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
140 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
141 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
142 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
143 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
144 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
145 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
146 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
147 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
148 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
149 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
150 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
151 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
152
153 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
154 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
155 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
156 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
157 {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
158 {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
159 {BRIDGE, M5602_XB_SIG_INI, 0x01},
160 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
161 {BRIDGE, M5602_XB_VSYNC_PARA, 0x08},
162 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
163 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
164 {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
165 {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
166 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
167 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
168 {BRIDGE, M5602_XB_SIG_INI, 0x00},
169 {BRIDGE, M5602_XB_SIG_INI, 0x02},
170 {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
171 {BRIDGE, M5602_XB_HSYNC_PARA, 0x27},
172 {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
173 {BRIDGE, M5602_XB_HSYNC_PARA, 0xa7},
174 {BRIDGE, M5602_XB_SIG_INI, 0x00},
175 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
176 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
177};
178
26static struct v4l2_pix_format ov7660_modes[] = { 179static struct v4l2_pix_format ov7660_modes[] = {
27 { 180 {
28 640, 181 640,
diff --git a/drivers/media/usb/gspca/m5602/m5602_ov7660.h b/drivers/media/usb/gspca/m5602/m5602_ov7660.h
index 6fece1ce1232..72445d5df195 100644
--- a/drivers/media/usb/gspca/m5602/m5602_ov7660.h
+++ b/drivers/media/usb/gspca/m5602/m5602_ov7660.h
@@ -107,157 +107,4 @@ static const struct m5602_sensor ov7660 = {
107 .stop = ov7660_stop, 107 .stop = ov7660_stop,
108 .disconnect = ov7660_disconnect, 108 .disconnect = ov7660_disconnect,
109}; 109};
110
111static const unsigned char preinit_ov7660[][4] = {
112 {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
113 {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
114 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
115 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
116 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
117 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
118 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
119 {BRIDGE, M5602_XB_GPIO_DIR, 0x03},
120 {BRIDGE, M5602_XB_GPIO_DIR, 0x03},
121 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
122 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
123
124 {SENSOR, OV7660_OFON, 0x0c},
125 {SENSOR, OV7660_COM2, 0x11},
126 {SENSOR, OV7660_COM7, 0x05},
127
128 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
129 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
130 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
131 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
132 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
133 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
134 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
135 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
136 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
137 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
138 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
139 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
140 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
141 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
142 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00}
143};
144
145static const unsigned char init_ov7660[][4] = {
146 {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
147 {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
148 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
149 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
150 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
151 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
152 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
153 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
154 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
155 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
156 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
157 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
158 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
159 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
160 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
161 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
162 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
163 {SENSOR, OV7660_COM7, 0x80},
164 {SENSOR, OV7660_CLKRC, 0x80},
165 {SENSOR, OV7660_COM9, 0x4c},
166 {SENSOR, OV7660_OFON, 0x43},
167 {SENSOR, OV7660_COM12, 0x28},
168 {SENSOR, OV7660_COM8, 0x00},
169 {SENSOR, OV7660_COM10, 0x40},
170 {SENSOR, OV7660_HSTART, 0x0c},
171 {SENSOR, OV7660_HSTOP, 0x61},
172 {SENSOR, OV7660_HREF, 0xa4},
173 {SENSOR, OV7660_PSHFT, 0x0b},
174 {SENSOR, OV7660_VSTART, 0x01},
175 {SENSOR, OV7660_VSTOP, 0x7a},
176 {SENSOR, OV7660_VSTOP, 0x00},
177 {SENSOR, OV7660_COM7, 0x05},
178 {SENSOR, OV7660_COM6, 0x42},
179 {SENSOR, OV7660_BBIAS, 0x94},
180 {SENSOR, OV7660_GbBIAS, 0x94},
181 {SENSOR, OV7660_RSVD29, 0x94},
182 {SENSOR, OV7660_RBIAS, 0x94},
183 {SENSOR, OV7660_COM1, 0x00},
184 {SENSOR, OV7660_AECH, 0x00},
185 {SENSOR, OV7660_AECHH, 0x00},
186 {SENSOR, OV7660_ADC, 0x05},
187 {SENSOR, OV7660_COM13, 0x00},
188 {SENSOR, OV7660_RSVDA1, 0x23},
189 {SENSOR, OV7660_TSLB, 0x0d},
190 {SENSOR, OV7660_HV, 0x80},
191 {SENSOR, OV7660_LCC1, 0x00},
192 {SENSOR, OV7660_LCC2, 0x00},
193 {SENSOR, OV7660_LCC3, 0x10},
194 {SENSOR, OV7660_LCC4, 0x40},
195 {SENSOR, OV7660_LCC5, 0x01},
196
197 {SENSOR, OV7660_AECH, 0x20},
198 {SENSOR, OV7660_COM1, 0x00},
199 {SENSOR, OV7660_OFON, 0x0c},
200 {SENSOR, OV7660_COM2, 0x11},
201 {SENSOR, OV7660_COM7, 0x05},
202 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
203 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
204 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
205 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
206 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
207 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
208 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
209 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
210 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
211 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
212 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
213 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
214 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
215 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
216 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
217 {SENSOR, OV7660_AECH, 0x5f},
218 {SENSOR, OV7660_COM1, 0x03},
219 {SENSOR, OV7660_OFON, 0x0c},
220 {SENSOR, OV7660_COM2, 0x11},
221 {SENSOR, OV7660_COM7, 0x05},
222 {BRIDGE, M5602_XB_GPIO_DIR, 0x01},
223 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
224 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
225 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
226 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
227 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x08},
228 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
229 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
230 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
231 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
232 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
233 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
234 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
235 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
236 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
237
238 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
239 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
240 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
241 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
242 {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
243 {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
244 {BRIDGE, M5602_XB_SIG_INI, 0x01},
245 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
246 {BRIDGE, M5602_XB_VSYNC_PARA, 0x08},
247 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
248 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
249 {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
250 {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
251 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
252 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
253 {BRIDGE, M5602_XB_SIG_INI, 0x00},
254 {BRIDGE, M5602_XB_SIG_INI, 0x02},
255 {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
256 {BRIDGE, M5602_XB_HSYNC_PARA, 0x27},
257 {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
258 {BRIDGE, M5602_XB_HSYNC_PARA, 0xa7},
259 {BRIDGE, M5602_XB_SIG_INI, 0x00},
260 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
261 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
262};
263#endif 110#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-24 07:35:17 -0500