diff options
Diffstat (limited to 'drivers/media/video/gspca/m5602/m5602_s5k83a.h')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_s5k83a.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h index 7814b078acd..80a63a236e2 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h +++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #define S5K83A_MAXIMUM_EXPOSURE 0x3c | 35 | #define S5K83A_MAXIMUM_EXPOSURE 0x3c |
36 | #define S5K83A_FLIP_MASK 0x10 | 36 | #define S5K83A_FLIP_MASK 0x10 |
37 | #define S5K83A_GPIO_LED_MASK 0x10 | 37 | #define S5K83A_GPIO_LED_MASK 0x10 |
38 | #define S5K83A_GPIO_ROTATION_MASK 0x40 | 38 | #define S5K83A_GPIO_ROTATION_MASK 0x40 |
39 | 39 | ||
40 | /*****************************************************************************/ | 40 | /*****************************************************************************/ |
41 | 41 | ||
@@ -67,8 +67,7 @@ struct s5k83a_priv { | |||
67 | s32 *settings; | 67 | s32 *settings; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static const unsigned char preinit_s5k83a[][4] = | 70 | static const unsigned char preinit_s5k83a[][4] = { |
71 | { | ||
72 | {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00}, | 71 | {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00}, |
73 | {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00}, | 72 | {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00}, |
74 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, | 73 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, |
@@ -108,8 +107,7 @@ static const unsigned char preinit_s5k83a[][4] = | |||
108 | /* This could probably be considerably shortened. | 107 | /* This could probably be considerably shortened. |
109 | I don't have the hardware to experiment with it, patches welcome | 108 | I don't have the hardware to experiment with it, patches welcome |
110 | */ | 109 | */ |
111 | static const unsigned char init_s5k83a[][4] = | 110 | static const unsigned char init_s5k83a[][4] = { |
112 | { | ||
113 | /* The following sequence is useless after a clean boot | 111 | /* The following sequence is useless after a clean boot |
114 | but is necessary after resume from suspend */ | 112 | but is necessary after resume from suspend */ |
115 | {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00}, | 113 | {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00}, |
@@ -166,8 +164,7 @@ static const unsigned char init_s5k83a[][4] = | |||
166 | {SENSOR, 0x00, 0x06, 0x00}, | 164 | {SENSOR, 0x00, 0x06, 0x00}, |
167 | }; | 165 | }; |
168 | 166 | ||
169 | static const unsigned char start_s5k83a[][4] = | 167 | static const unsigned char start_s5k83a[][4] = { |
170 | { | ||
171 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00}, | 168 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00}, |
172 | {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00}, | 169 | {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00}, |
173 | {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00}, | 170 | {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00}, |
@@ -193,5 +190,4 @@ static const unsigned char start_s5k83a[][4] = | |||
193 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, | 190 | {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00}, |
194 | {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00}, | 191 | {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00}, |
195 | }; | 192 | }; |
196 | |||
197 | #endif | 193 | #endif |