From: Matthew Michilot <[email protected]>

Captured video would be out of sync when using the adv7280 with
the BT.656-4 protocol. Certain registers (0x04, 0x31, 0xE6) had to
be configured properly to ensure BT.656-4 compatibility.

An error in the adv7280 reference manual suggested that EAV/SAV mode
was enabled by default, however upon inspecting register 0x31, it was
determined to be disabled by default.

Signed-off-by: Matthew Michilot <[email protected]>
Reviewed-by: Tim Harvey <[email protected]>
---
 drivers/media/i2c/adv7180.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 99697baad2ea..27da424dce76 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -94,6 +94,7 @@
 #define ADV7180_REG_SHAP_FILTER_CTL_1  0x0017
 #define ADV7180_REG_CTRL_2             0x001d
 #define ADV7180_REG_VSYNC_FIELD_CTL_1  0x0031
+#define ADV7180_VSYNC_FIELD_CTL_1_NEWAV 0x12
 #define ADV7180_REG_MANUAL_WIN_CTL_1   0x003d
 #define ADV7180_REG_MANUAL_WIN_CTL_2   0x003e
 #define ADV7180_REG_MANUAL_WIN_CTL_3   0x003f
@@ -935,10 +936,20 @@ static int adv7182_init(struct adv7180_state *state)
                adv7180_write(state, ADV7180_REG_EXTENDED_OUTPUT_CONTROL, 0x57);
                adv7180_write(state, ADV7180_REG_CTRL_2, 0xc0);
        } else {
-               if (state->chip_info->flags & ADV7180_FLAG_V2)
+               if (state->chip_info->flags & ADV7180_FLAG_V2) {
+                       /* ITU-R BT.656-4 compatible */
                        adv7180_write(state,
                                      ADV7180_REG_EXTENDED_OUTPUT_CONTROL,
-                                     0x17);
+                                     ADV7180_EXTENDED_OUTPUT_CONTROL_NTSCDIS);
+                       /* Manually set NEWAVMODE */
+                       adv7180_write(state,
+                                     ADV7180_REG_VSYNC_FIELD_CTL_1,
+                                     ADV7180_VSYNC_FIELD_CTL_1_NEWAV);
+                       /* Manually set V bit end position in NTSC mode */
+                       adv7180_write(state,
+                                     ADV7180_REG_NTSC_V_BIT_END,
+                                     ADV7180_NTSC_V_BIT_END_MANUAL_NVEND);
+               }
                else
                        adv7180_write(state,
                                      ADV7180_REG_EXTENDED_OUTPUT_CONTROL,
-- 
2.17.1

Reply via email to