projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| d006af40 AF |
1 | From 1115becbb4875d62abb10f94a9510c81f376606f Mon Sep 17 00:00:00 2001 |
| 2 | From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 3 | Date: Wed, 26 Sep 2012 10:54:17 +0200 | |
| 4 | Subject: [PATCH 3/6] mt9m032: Define MT9M032_READ_MODE1 bits | |
| 5 | ||
| 6 | Replace hardcoded values with #define's. | |
| 7 | ||
| 8 | Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 9 | --- | |
| 10 | drivers/media/i2c/mt9m032.c | 22 +++++++++++++++++++++- | |
| 11 | 1 file changed, 21 insertions(+), 1 deletion(-) | |
| 12 | ||
| 13 | diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c | |
| 14 | index 30d755a..de150d3 100644 | |
| 15 | --- a/drivers/media/i2c/mt9m032.c | |
| 16 | +++ b/drivers/media/i2c/mt9m032.c | |
| 17 | @@ -90,6 +90,24 @@ | |
| 18 | #define MT9M032_PLL_CONFIG1_PREDIV_MASK 0x3f | |
| 19 | #define MT9M032_PLL_CONFIG1_MUL_SHIFT 8 | |
| 20 | #define MT9M032_READ_MODE1 0x1e | |
| 21 | +#define MT9M032_READ_MODE1_OUTPUT_BAD_FRAMES (1 << 13) | |
| 22 | +#define MT9M032_READ_MODE1_MAINTAIN_FRAME_RATE (1 << 12) | |
| 23 | +#define MT9M032_READ_MODE1_XOR_LINE_VALID (1 << 11) | |
| 24 | +#define MT9M032_READ_MODE1_CONT_LINE_VALID (1 << 10) | |
| 25 | +#define MT9M032_READ_MODE1_INVERT_TRIGGER (1 << 9) | |
| 26 | +#define MT9M032_READ_MODE1_SNAPSHOT (1 << 8) | |
| 27 | +#define MT9M032_READ_MODE1_GLOBAL_RESET (1 << 7) | |
| 28 | +#define MT9M032_READ_MODE1_BULB_EXPOSURE (1 << 6) | |
| 29 | +#define MT9M032_READ_MODE1_INVERT_STROBE (1 << 5) | |
| 30 | +#define MT9M032_READ_MODE1_STROBE_ENABLE (1 << 4) | |
| 31 | +#define MT9M032_READ_MODE1_STROBE_START_TRIG1 (0 << 2) | |
| 32 | +#define MT9M032_READ_MODE1_STROBE_START_EXP (1 << 2) | |
| 33 | +#define MT9M032_READ_MODE1_STROBE_START_SHUTTER (2 << 2) | |
| 34 | +#define MT9M032_READ_MODE1_STROBE_START_TRIG2 (3 << 2) | |
| 35 | +#define MT9M032_READ_MODE1_STROBE_END_TRIG1 (0 << 0) | |
| 36 | +#define MT9M032_READ_MODE1_STROBE_END_EXP (1 << 0) | |
| 37 | +#define MT9M032_READ_MODE1_STROBE_END_SHUTTER (2 << 0) | |
| 38 | +#define MT9M032_READ_MODE1_STROBE_END_TRIG2 (3 << 0) | |
| 39 | #define MT9M032_READ_MODE2 0x20 | |
| 40 | #define MT9M032_READ_MODE2_VFLIP_SHIFT 15 | |
| 41 | #define MT9M032_READ_MODE2_HFLIP_SHIFT 14 | |
| 42 | @@ -282,7 +300,9 @@ static int mt9m032_setup_pll(struct mt9m032 *sensor) | |
| 43 | MT9P031_PLL_CONTROL_PWRON | | |
| 44 | MT9P031_PLL_CONTROL_USEPLL); | |
| 45 | if (!ret) /* more reserved, Continuous, Master Mode */ | |
| 46 | - ret = mt9m032_write(client, MT9M032_READ_MODE1, 0x8006); | |
| 47 | + ret = mt9m032_write(client, MT9M032_READ_MODE1, 0x8000 | | |
| 48 | + MT9M032_READ_MODE1_STROBE_START_EXP | | |
| 49 | + MT9M032_READ_MODE1_STROBE_END_SHUTTER); | |
| 50 | if (!ret) { | |
| 51 | reg_val = (pll.p1 == 6 ? MT9M032_FORMATTER1_PLL_P1_6 : 0) | |
| 52 | | MT9M032_FORMATTER1_PARALLEL | 0x001e; /* 14-bit */ | |
| 53 | -- | |
| 54 | 1.7.10.4 | |
| 55 |