diff options
Diffstat (limited to 'drivers/media/video/gspca/m5602/m5602_mt9m111.h')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_mt9m111.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h index b3de77823091..b1f0c492036a 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h +++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h | |||
@@ -70,7 +70,7 @@ | |||
70 | #define MT9M111_COLORPIPE 0x01 | 70 | #define MT9M111_COLORPIPE 0x01 |
71 | #define MT9M111_CAMERA_CONTROL 0x02 | 71 | #define MT9M111_CAMERA_CONTROL 0x02 |
72 | 72 | ||
73 | #define MT9M111_RESET (1 << 0) | 73 | #define MT9M111_RESET (1 << 0) |
74 | #define MT9M111_RESTART (1 << 1) | 74 | #define MT9M111_RESTART (1 << 1) |
75 | #define MT9M111_ANALOG_STANDBY (1 << 2) | 75 | #define MT9M111_ANALOG_STANDBY (1 << 2) |
76 | #define MT9M111_CHIP_ENABLE (1 << 3) | 76 | #define MT9M111_CHIP_ENABLE (1 << 3) |
@@ -97,7 +97,7 @@ | |||
97 | #define MT9M111_2D_DEFECT_CORRECTION_ENABLE (1 << 0) | 97 | #define MT9M111_2D_DEFECT_CORRECTION_ENABLE (1 << 0) |
98 | 98 | ||
99 | #define INITIAL_MAX_GAIN 64 | 99 | #define INITIAL_MAX_GAIN 64 |
100 | #define MT9M111_DEFAULT_GAIN 283 | 100 | #define MT9M111_DEFAULT_GAIN 283 |
101 | #define MT9M111_GREEN_GAIN_DEFAULT 0x20 | 101 | #define MT9M111_GREEN_GAIN_DEFAULT 0x20 |
102 | #define MT9M111_BLUE_GAIN_DEFAULT 0x20 | 102 | #define MT9M111_BLUE_GAIN_DEFAULT 0x20 |
103 | #define MT9M111_RED_GAIN_DEFAULT 0x20 | 103 | #define MT9M111_RED_GAIN_DEFAULT 0x20 |
@@ -125,8 +125,7 @@ static const struct m5602_sensor mt9m111 = { | |||
125 | .start = mt9m111_start, | 125 | .start = mt9m111_start, |
126 | }; | 126 | }; |
127 | 127 | ||
128 | static const unsigned char preinit_mt9m111[][4] = | 128 | static const unsigned char preinit_mt9m111[][4] = { |
129 | { | ||
130 | {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00}, | 129 | {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00}, |
131 | {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00}, | 130 | {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00}, |
132 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, | 131 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, |
@@ -165,8 +164,7 @@ static const unsigned char preinit_mt9m111[][4] = | |||
165 | {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00} | 164 | {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00} |
166 | }; | 165 | }; |
167 | 166 | ||
168 | static const unsigned char init_mt9m111[][4] = | 167 | static const unsigned char init_mt9m111[][4] = { |
169 | { | ||
170 | {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00}, | 168 | {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00}, |
171 | {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00}, | 169 | {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00}, |
172 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, | 170 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, |
@@ -257,8 +255,7 @@ static const unsigned char init_mt9m111[][4] = | |||
257 | {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90}, | 255 | {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90}, |
258 | }; | 256 | }; |
259 | 257 | ||
260 | static const unsigned char start_mt9m111[][4] = | 258 | static const unsigned char start_mt9m111[][4] = { |
261 | { | ||
262 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00}, | 259 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00}, |
263 | {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00}, | 260 | {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00}, |
264 | {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00}, | 261 | {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00}, |
@@ -271,5 +268,4 @@ static const unsigned char start_mt9m111[][4] = | |||
271 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00}, | 268 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00}, |
272 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00}, | 269 | {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00}, |
273 | }; | 270 | }; |
274 | |||
275 | #endif | 271 | #endif |