diff options
author | Andrew Chew <achew@nvidia.com> | 2011-06-23 19:19:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:24 -0400 |
commit | c6aac9fcdd6d92cf89d3ce41fcc10e75fbdde9df (patch) | |
tree | 7905f7837831ef4fa446a9f63395ac73c7c751fd /drivers/media/video/ov9740.c | |
parent | 195ebc43bf76df2232d8c55ae284725e73d7a80e (diff) |
[media] V4L: ov9740: Cleanup hex casing inconsistencies
Made all hex number casing use lower-case throughout the entire driver
for consistency.
Signed-off-by: Andrew Chew <achew@nvidia.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov9740.c')
-rw-r--r-- | drivers/media/video/ov9740.c | 111 |
1 files changed, 55 insertions, 56 deletions
diff --git a/drivers/media/video/ov9740.c b/drivers/media/video/ov9740.c index 4d4ee4faca69..96811e42993d 100644 --- a/drivers/media/video/ov9740.c +++ b/drivers/media/video/ov9740.c | |||
@@ -44,12 +44,12 @@ | |||
44 | #define OV9740_Y_ADDR_START_LO 0x0347 | 44 | #define OV9740_Y_ADDR_START_LO 0x0347 |
45 | #define OV9740_X_ADDR_END_HI 0x0348 | 45 | #define OV9740_X_ADDR_END_HI 0x0348 |
46 | #define OV9740_X_ADDR_END_LO 0x0349 | 46 | #define OV9740_X_ADDR_END_LO 0x0349 |
47 | #define OV9740_Y_ADDR_END_HI 0x034A | 47 | #define OV9740_Y_ADDR_END_HI 0x034a |
48 | #define OV9740_Y_ADDR_END_LO 0x034B | 48 | #define OV9740_Y_ADDR_END_LO 0x034b |
49 | #define OV9740_X_OUTPUT_SIZE_HI 0x034C | 49 | #define OV9740_X_OUTPUT_SIZE_HI 0x034c |
50 | #define OV9740_X_OUTPUT_SIZE_LO 0x034D | 50 | #define OV9740_X_OUTPUT_SIZE_LO 0x034d |
51 | #define OV9740_Y_OUTPUT_SIZE_HI 0x034E | 51 | #define OV9740_Y_OUTPUT_SIZE_HI 0x034e |
52 | #define OV9740_Y_OUTPUT_SIZE_LO 0x034F | 52 | #define OV9740_Y_OUTPUT_SIZE_LO 0x034f |
53 | 53 | ||
54 | /* IO Control Registers */ | 54 | /* IO Control Registers */ |
55 | #define OV9740_IO_CREL00 0x3002 | 55 | #define OV9740_IO_CREL00 0x3002 |
@@ -89,28 +89,28 @@ | |||
89 | #define OV9740_TIMING_CTRL35 0x3835 | 89 | #define OV9740_TIMING_CTRL35 0x3835 |
90 | 90 | ||
91 | /* Banding Filter */ | 91 | /* Banding Filter */ |
92 | #define OV9740_AEC_MAXEXPO_60_H 0x3A02 | 92 | #define OV9740_AEC_MAXEXPO_60_H 0x3a02 |
93 | #define OV9740_AEC_MAXEXPO_60_L 0x3A03 | 93 | #define OV9740_AEC_MAXEXPO_60_L 0x3a03 |
94 | #define OV9740_AEC_B50_STEP_HI 0x3A08 | 94 | #define OV9740_AEC_B50_STEP_HI 0x3a08 |
95 | #define OV9740_AEC_B50_STEP_LO 0x3A09 | 95 | #define OV9740_AEC_B50_STEP_LO 0x3a09 |
96 | #define OV9740_AEC_B60_STEP_HI 0x3A0A | 96 | #define OV9740_AEC_B60_STEP_HI 0x3a0a |
97 | #define OV9740_AEC_B60_STEP_LO 0x3A0B | 97 | #define OV9740_AEC_B60_STEP_LO 0x3a0b |
98 | #define OV9740_AEC_CTRL0D 0x3A0D | 98 | #define OV9740_AEC_CTRL0D 0x3a0d |
99 | #define OV9740_AEC_CTRL0E 0x3A0E | 99 | #define OV9740_AEC_CTRL0E 0x3a0e |
100 | #define OV9740_AEC_MAXEXPO_50_H 0x3A14 | 100 | #define OV9740_AEC_MAXEXPO_50_H 0x3a14 |
101 | #define OV9740_AEC_MAXEXPO_50_L 0x3A15 | 101 | #define OV9740_AEC_MAXEXPO_50_L 0x3a15 |
102 | 102 | ||
103 | /* AEC/AGC Control */ | 103 | /* AEC/AGC Control */ |
104 | #define OV9740_AEC_ENABLE 0x3503 | 104 | #define OV9740_AEC_ENABLE 0x3503 |
105 | #define OV9740_GAIN_CEILING_01 0x3A18 | 105 | #define OV9740_GAIN_CEILING_01 0x3a18 |
106 | #define OV9740_GAIN_CEILING_02 0x3A19 | 106 | #define OV9740_GAIN_CEILING_02 0x3a19 |
107 | #define OV9740_AEC_HI_THRESHOLD 0x3A11 | 107 | #define OV9740_AEC_HI_THRESHOLD 0x3a11 |
108 | #define OV9740_AEC_3A1A 0x3A1A | 108 | #define OV9740_AEC_3A1A 0x3a1a |
109 | #define OV9740_AEC_CTRL1B_WPT2 0x3A1B | 109 | #define OV9740_AEC_CTRL1B_WPT2 0x3a1b |
110 | #define OV9740_AEC_CTRL0F_WPT 0x3A0F | 110 | #define OV9740_AEC_CTRL0F_WPT 0x3a0f |
111 | #define OV9740_AEC_CTRL10_BPT 0x3A10 | 111 | #define OV9740_AEC_CTRL10_BPT 0x3a10 |
112 | #define OV9740_AEC_CTRL1E_BPT2 0x3A1E | 112 | #define OV9740_AEC_CTRL1E_BPT2 0x3a1e |
113 | #define OV9740_AEC_LO_THRESHOLD 0x3A1F | 113 | #define OV9740_AEC_LO_THRESHOLD 0x3a1f |
114 | 114 | ||
115 | /* BLC Control */ | 115 | /* BLC Control */ |
116 | #define OV9740_BLC_AUTO_ENABLE 0x4002 | 116 | #define OV9740_BLC_AUTO_ENABLE 0x4002 |
@@ -132,7 +132,7 @@ | |||
132 | #define OV9740_VT_SYS_CLK_DIV 0x0303 | 132 | #define OV9740_VT_SYS_CLK_DIV 0x0303 |
133 | #define OV9740_VT_PIX_CLK_DIV 0x0301 | 133 | #define OV9740_VT_PIX_CLK_DIV 0x0301 |
134 | #define OV9740_PLL_CTRL3010 0x3010 | 134 | #define OV9740_PLL_CTRL3010 0x3010 |
135 | #define OV9740_VFIFO_CTRL00 0x460E | 135 | #define OV9740_VFIFO_CTRL00 0x460e |
136 | 136 | ||
137 | /* ISP Control */ | 137 | /* ISP Control */ |
138 | #define OV9740_ISP_CTRL00 0x5000 | 138 | #define OV9740_ISP_CTRL00 0x5000 |
@@ -141,9 +141,9 @@ | |||
141 | #define OV9740_ISP_CTRL05 0x5005 | 141 | #define OV9740_ISP_CTRL05 0x5005 |
142 | #define OV9740_ISP_CTRL12 0x5012 | 142 | #define OV9740_ISP_CTRL12 0x5012 |
143 | #define OV9740_ISP_CTRL19 0x5019 | 143 | #define OV9740_ISP_CTRL19 0x5019 |
144 | #define OV9740_ISP_CTRL1A 0x501A | 144 | #define OV9740_ISP_CTRL1A 0x501a |
145 | #define OV9740_ISP_CTRL1E 0x501E | 145 | #define OV9740_ISP_CTRL1E 0x501e |
146 | #define OV9740_ISP_CTRL1F 0x501F | 146 | #define OV9740_ISP_CTRL1F 0x501f |
147 | #define OV9740_ISP_CTRL20 0x5020 | 147 | #define OV9740_ISP_CTRL20 0x5020 |
148 | #define OV9740_ISP_CTRL21 0x5021 | 148 | #define OV9740_ISP_CTRL21 0x5021 |
149 | 149 | ||
@@ -158,12 +158,12 @@ | |||
158 | #define OV9740_AWB_ADV_CTRL04 0x5187 | 158 | #define OV9740_AWB_ADV_CTRL04 0x5187 |
159 | #define OV9740_AWB_ADV_CTRL05 0x5188 | 159 | #define OV9740_AWB_ADV_CTRL05 0x5188 |
160 | #define OV9740_AWB_ADV_CTRL06 0x5189 | 160 | #define OV9740_AWB_ADV_CTRL06 0x5189 |
161 | #define OV9740_AWB_ADV_CTRL07 0x518A | 161 | #define OV9740_AWB_ADV_CTRL07 0x518a |
162 | #define OV9740_AWB_ADV_CTRL08 0x518B | 162 | #define OV9740_AWB_ADV_CTRL08 0x518b |
163 | #define OV9740_AWB_ADV_CTRL09 0x518C | 163 | #define OV9740_AWB_ADV_CTRL09 0x518c |
164 | #define OV9740_AWB_ADV_CTRL10 0x518D | 164 | #define OV9740_AWB_ADV_CTRL10 0x518d |
165 | #define OV9740_AWB_ADV_CTRL11 0x518E | 165 | #define OV9740_AWB_ADV_CTRL11 0x518e |
166 | #define OV9740_AWB_CTRL0F 0x518F | 166 | #define OV9740_AWB_CTRL0F 0x518f |
167 | #define OV9740_AWB_CTRL10 0x5190 | 167 | #define OV9740_AWB_CTRL10 0x5190 |
168 | #define OV9740_AWB_CTRL11 0x5191 | 168 | #define OV9740_AWB_CTRL11 0x5191 |
169 | #define OV9740_AWB_CTRL12 0x5192 | 169 | #define OV9740_AWB_CTRL12 0x5192 |
@@ -241,36 +241,36 @@ static const struct ov9740_reg ov9740_defaults[] = { | |||
241 | /* Un-documented OV9740 registers */ | 241 | /* Un-documented OV9740 registers */ |
242 | { 0x5800, 0x29 }, { 0x5801, 0x25 }, { 0x5802, 0x20 }, { 0x5803, 0x21 }, | 242 | { 0x5800, 0x29 }, { 0x5801, 0x25 }, { 0x5802, 0x20 }, { 0x5803, 0x21 }, |
243 | { 0x5804, 0x26 }, { 0x5805, 0x2e }, { 0x5806, 0x11 }, { 0x5807, 0x0c }, | 243 | { 0x5804, 0x26 }, { 0x5805, 0x2e }, { 0x5806, 0x11 }, { 0x5807, 0x0c }, |
244 | { 0x5808, 0x09 }, { 0x5809, 0x0a }, { 0x580A, 0x0e }, { 0x580B, 0x16 }, | 244 | { 0x5808, 0x09 }, { 0x5809, 0x0a }, { 0x580a, 0x0e }, { 0x580b, 0x16 }, |
245 | { 0x580C, 0x06 }, { 0x580D, 0x02 }, { 0x580E, 0x00 }, { 0x580F, 0x00 }, | 245 | { 0x580c, 0x06 }, { 0x580d, 0x02 }, { 0x580e, 0x00 }, { 0x580f, 0x00 }, |
246 | { 0x5810, 0x04 }, { 0x5811, 0x0a }, { 0x5812, 0x05 }, { 0x5813, 0x02 }, | 246 | { 0x5810, 0x04 }, { 0x5811, 0x0a }, { 0x5812, 0x05 }, { 0x5813, 0x02 }, |
247 | { 0x5814, 0x00 }, { 0x5815, 0x00 }, { 0x5816, 0x03 }, { 0x5817, 0x09 }, | 247 | { 0x5814, 0x00 }, { 0x5815, 0x00 }, { 0x5816, 0x03 }, { 0x5817, 0x09 }, |
248 | { 0x5818, 0x0f }, { 0x5819, 0x0a }, { 0x581A, 0x07 }, { 0x581B, 0x08 }, | 248 | { 0x5818, 0x0f }, { 0x5819, 0x0a }, { 0x581a, 0x07 }, { 0x581b, 0x08 }, |
249 | { 0x581C, 0x0b }, { 0x581D, 0x14 }, { 0x581E, 0x28 }, { 0x581F, 0x23 }, | 249 | { 0x581c, 0x0b }, { 0x581d, 0x14 }, { 0x581e, 0x28 }, { 0x581f, 0x23 }, |
250 | { 0x5820, 0x1d }, { 0x5821, 0x1e }, { 0x5822, 0x24 }, { 0x5823, 0x2a }, | 250 | { 0x5820, 0x1d }, { 0x5821, 0x1e }, { 0x5822, 0x24 }, { 0x5823, 0x2a }, |
251 | { 0x5824, 0x4f }, { 0x5825, 0x6f }, { 0x5826, 0x5f }, { 0x5827, 0x7f }, | 251 | { 0x5824, 0x4f }, { 0x5825, 0x6f }, { 0x5826, 0x5f }, { 0x5827, 0x7f }, |
252 | { 0x5828, 0x9f }, { 0x5829, 0x5f }, { 0x582A, 0x8f }, { 0x582B, 0x9e }, | 252 | { 0x5828, 0x9f }, { 0x5829, 0x5f }, { 0x582a, 0x8f }, { 0x582b, 0x9e }, |
253 | { 0x582C, 0x8f }, { 0x582D, 0x9f }, { 0x582E, 0x4f }, { 0x582F, 0x87 }, | 253 | { 0x582c, 0x8f }, { 0x582d, 0x9f }, { 0x582e, 0x4f }, { 0x582f, 0x87 }, |
254 | { 0x5830, 0x86 }, { 0x5831, 0x97 }, { 0x5832, 0xae }, { 0x5833, 0x3f }, | 254 | { 0x5830, 0x86 }, { 0x5831, 0x97 }, { 0x5832, 0xae }, { 0x5833, 0x3f }, |
255 | { 0x5834, 0x8e }, { 0x5835, 0x7c }, { 0x5836, 0x7e }, { 0x5837, 0xaf }, | 255 | { 0x5834, 0x8e }, { 0x5835, 0x7c }, { 0x5836, 0x7e }, { 0x5837, 0xaf }, |
256 | { 0x5838, 0x8f }, { 0x5839, 0x8f }, { 0x583A, 0x9f }, { 0x583B, 0x7f }, | 256 | { 0x5838, 0x8f }, { 0x5839, 0x8f }, { 0x583a, 0x9f }, { 0x583b, 0x7f }, |
257 | { 0x583C, 0x5f }, | 257 | { 0x583c, 0x5f }, |
258 | 258 | ||
259 | /* Y Gamma */ | 259 | /* Y Gamma */ |
260 | { 0x5480, 0x07 }, { 0x5481, 0x18 }, { 0x5482, 0x2c }, { 0x5483, 0x4e }, | 260 | { 0x5480, 0x07 }, { 0x5481, 0x18 }, { 0x5482, 0x2c }, { 0x5483, 0x4e }, |
261 | { 0x5484, 0x5e }, { 0x5485, 0x6b }, { 0x5486, 0x77 }, { 0x5487, 0x82 }, | 261 | { 0x5484, 0x5e }, { 0x5485, 0x6b }, { 0x5486, 0x77 }, { 0x5487, 0x82 }, |
262 | { 0x5488, 0x8c }, { 0x5489, 0x95 }, { 0x548A, 0xa4 }, { 0x548B, 0xb1 }, | 262 | { 0x5488, 0x8c }, { 0x5489, 0x95 }, { 0x548a, 0xa4 }, { 0x548b, 0xb1 }, |
263 | { 0x548C, 0xc6 }, { 0x548D, 0xd8 }, { 0x548E, 0xe9 }, | 263 | { 0x548c, 0xc6 }, { 0x548d, 0xd8 }, { 0x548e, 0xe9 }, |
264 | 264 | ||
265 | /* UV Gamma */ | 265 | /* UV Gamma */ |
266 | { 0x5490, 0x0f }, { 0x5491, 0xff }, { 0x5492, 0x0d }, { 0x5493, 0x05 }, | 266 | { 0x5490, 0x0f }, { 0x5491, 0xff }, { 0x5492, 0x0d }, { 0x5493, 0x05 }, |
267 | { 0x5494, 0x07 }, { 0x5495, 0x1a }, { 0x5496, 0x04 }, { 0x5497, 0x01 }, | 267 | { 0x5494, 0x07 }, { 0x5495, 0x1a }, { 0x5496, 0x04 }, { 0x5497, 0x01 }, |
268 | { 0x5498, 0x03 }, { 0x5499, 0x53 }, { 0x549A, 0x02 }, { 0x549B, 0xeb }, | 268 | { 0x5498, 0x03 }, { 0x5499, 0x53 }, { 0x549a, 0x02 }, { 0x549b, 0xeb }, |
269 | { 0x549C, 0x02 }, { 0x549D, 0xa0 }, { 0x549E, 0x02 }, { 0x549F, 0x67 }, | 269 | { 0x549c, 0x02 }, { 0x549d, 0xa0 }, { 0x549e, 0x02 }, { 0x549f, 0x67 }, |
270 | { 0x54A0, 0x02 }, { 0x54A1, 0x3b }, { 0x54A2, 0x02 }, { 0x54A3, 0x18 }, | 270 | { 0x54a0, 0x02 }, { 0x54a1, 0x3b }, { 0x54a2, 0x02 }, { 0x54a3, 0x18 }, |
271 | { 0x54A4, 0x01 }, { 0x54A5, 0xe7 }, { 0x54A6, 0x01 }, { 0x54A7, 0xc3 }, | 271 | { 0x54a4, 0x01 }, { 0x54a5, 0xe7 }, { 0x54a6, 0x01 }, { 0x54a7, 0xc3 }, |
272 | { 0x54A8, 0x01 }, { 0x54A9, 0x94 }, { 0x54AA, 0x01 }, { 0x54AB, 0x72 }, | 272 | { 0x54a8, 0x01 }, { 0x54a9, 0x94 }, { 0x54aa, 0x01 }, { 0x54ab, 0x72 }, |
273 | { 0x54AC, 0x01 }, { 0x54AD, 0x57 }, | 273 | { 0x54ac, 0x01 }, { 0x54ad, 0x57 }, |
274 | 274 | ||
275 | /* AWB */ | 275 | /* AWB */ |
276 | { OV9740_AWB_CTRL00, 0xf0 }, | 276 | { OV9740_AWB_CTRL00, 0xf0 }, |
@@ -296,18 +296,18 @@ static const struct ov9740_reg ov9740_defaults[] = { | |||
296 | { OV9740_AWB_CTRL14, 0x00 }, | 296 | { OV9740_AWB_CTRL14, 0x00 }, |
297 | 297 | ||
298 | /* CIP */ | 298 | /* CIP */ |
299 | { 0x530D, 0x12 }, | 299 | { 0x530d, 0x12 }, |
300 | 300 | ||
301 | /* CMX */ | 301 | /* CMX */ |
302 | { 0x5380, 0x01 }, { 0x5381, 0x00 }, { 0x5382, 0x00 }, { 0x5383, 0x17 }, | 302 | { 0x5380, 0x01 }, { 0x5381, 0x00 }, { 0x5382, 0x00 }, { 0x5383, 0x17 }, |
303 | { 0x5384, 0x00 }, { 0x5385, 0x01 }, { 0x5386, 0x00 }, { 0x5387, 0x00 }, | 303 | { 0x5384, 0x00 }, { 0x5385, 0x01 }, { 0x5386, 0x00 }, { 0x5387, 0x00 }, |
304 | { 0x5388, 0x00 }, { 0x5389, 0xe0 }, { 0x538A, 0x00 }, { 0x538B, 0x20 }, | 304 | { 0x5388, 0x00 }, { 0x5389, 0xe0 }, { 0x538a, 0x00 }, { 0x538b, 0x20 }, |
305 | { 0x538C, 0x00 }, { 0x538D, 0x00 }, { 0x538E, 0x00 }, { 0x538F, 0x16 }, | 305 | { 0x538c, 0x00 }, { 0x538d, 0x00 }, { 0x538e, 0x00 }, { 0x538f, 0x16 }, |
306 | { 0x5390, 0x00 }, { 0x5391, 0x9c }, { 0x5392, 0x00 }, { 0x5393, 0xa0 }, | 306 | { 0x5390, 0x00 }, { 0x5391, 0x9c }, { 0x5392, 0x00 }, { 0x5393, 0xa0 }, |
307 | { 0x5394, 0x18 }, | 307 | { 0x5394, 0x18 }, |
308 | 308 | ||
309 | /* 50/60 Detection */ | 309 | /* 50/60 Detection */ |
310 | { 0x3C0A, 0x9c }, { 0x3C0B, 0x3f }, | 310 | { 0x3c0a, 0x9c }, { 0x3c0b, 0x3f }, |
311 | 311 | ||
312 | /* Output Select */ | 312 | /* Output Select */ |
313 | { OV9740_IO_OUTPUT_SEL01, 0x00 }, | 313 | { OV9740_IO_OUTPUT_SEL01, 0x00 }, |
@@ -909,7 +909,6 @@ static struct v4l2_subdev_core_ops ov9740_core_ops = { | |||
909 | .g_register = ov9740_get_register, | 909 | .g_register = ov9740_get_register, |
910 | .s_register = ov9740_set_register, | 910 | .s_register = ov9740_set_register, |
911 | #endif | 911 | #endif |
912 | |||
913 | }; | 912 | }; |
914 | 913 | ||
915 | static struct v4l2_subdev_video_ops ov9740_video_ops = { | 914 | static struct v4l2_subdev_video_ops ov9740_video_ops = { |