aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Andr?n <erik.andren@gmail.com>2009-01-13 01:46:24 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 17:20:31 -0400
commite8a574052e3f05a86d7363065f6734626e34f389 (patch)
treed54dabbbd1747ca793f7dd80b8687d611c98ddda
parent1351a58ce0481afd80b756ecd9307c9fbe9f39b4 (diff)
V4L/DVB (11520): gspca - m5602-po1030: Remove redundant init sequences
Signed-off-by: Erik Andr?n <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/m5602/m5602_po1030.h48
1 files changed, 2 insertions, 46 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h
index b70879fddce..3ecacf0ed48 100644
--- a/drivers/media/video/gspca/m5602/m5602_po1030.h
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.h
@@ -170,55 +170,21 @@ static const unsigned char preinit_po1030[][3] =
170 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00}, 170 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
171 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}, 171 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
172 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0}, 172 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
173 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
174 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00}, 173 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
175 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
176 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c}, 174 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
177 175 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
178 {SENSOR, PO1030_AUTOCTRL2, PO1030_SENSOR_RESET | (1 << 2)},
179
180 {BRIDGE, M5602_XB_GPIO_DIR, 0x05}, 176 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
181 {BRIDGE, M5602_XB_GPIO_DAT, 0x04}, 177 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
182 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06}, 178 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
183 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06}, 179 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
184 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02}, 180 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
185 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
186 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
187 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
188 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
189 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
190 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
191 {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
192 {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
193 {BRIDGE, M5602_XB_SIG_INI, 0x01},
194 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
195 {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
196 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
197 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
198 {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
199 {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
200 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
201 {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
202 {BRIDGE, M5602_XB_SIG_INI, 0x00},
203 {BRIDGE, M5602_XB_SIG_INI, 0x02},
204 {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
205 {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
206 {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
207 {BRIDGE, M5602_XB_HSYNC_PARA, 0x87},
208 {BRIDGE, M5602_XB_SIG_INI, 0x00},
209 181
210 {SENSOR, PO1030_AUTOCTRL2, PO1030_SENSOR_RESET | (1 << 2)}, 182 {SENSOR, PO1030_AUTOCTRL2, PO1030_SENSOR_RESET | (1 << 2)},
211 183
212 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
213 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
214 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
215 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
216 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
217 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04}, 184 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
218 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}, 185 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
219 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00}, 186 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
220 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}, 187 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
221 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
222 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c}, 188 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
223 {BRIDGE, M5602_XB_GPIO_DIR, 0x05}, 189 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
224 {BRIDGE, M5602_XB_GPIO_DAT, 0x00} 190 {BRIDGE, M5602_XB_GPIO_DAT, 0x00}
@@ -228,36 +194,26 @@ static const unsigned char init_po1030[][3] =
228{ 194{
229 {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02}, 195 {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
230 {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0}, 196 {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
231 /*sequence 1*/
232 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00}, 197 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
233 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}, 198 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
234 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0}, 199 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
235 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
236
237 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00}, 200 {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
238 {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
239 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c}, 201 {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
240 /*end of sequence 1*/
241 202
242 /*sequence 2 stop */
243 {SENSOR, PO1030_AUTOCTRL2, PO1030_SENSOR_RESET | (1 << 2)}, 203 {SENSOR, PO1030_AUTOCTRL2, PO1030_SENSOR_RESET | (1 << 2)},
244 204
245 {BRIDGE, M5602_XB_GPIO_DIR, 0x05}, 205 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
246 {BRIDGE, M5602_XB_GPIO_DAT, 0x04}, 206 {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
247 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06}, 207 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
208 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
248 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06}, 209 {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
249 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02}, 210 {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
250 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04}, 211 {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
251 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}, 212 {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
252 /*end of sequence 2 stop */
253
254 {BRIDGE, M5602_XB_GPIO_DIR, 0x05}, 213 {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
255 {BRIDGE, M5602_XB_GPIO_DAT, 0x00}, 214 {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
256 {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
257 {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
258 215
259 {SENSOR, PO1030_AUTOCTRL2, 0x04}, 216 {SENSOR, PO1030_AUTOCTRL2, 0x04},
260
261}; 217};
262 218
263static const unsigned char start_po1030[][3] = 219static const unsigned char start_po1030[][3] =