From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761AbcGTAEL (ORCPT ); Tue, 19 Jul 2016 20:04:11 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33287 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752725AbcGTAEH (ORCPT ); Tue, 19 Jul 2016 20:04:07 -0400 From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: lars@metafoo.de Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Steve Longerbeam Subject: [PATCH v2 10/10] media: adv7180: fix field type Date: Tue, 19 Jul 2016 17:03:37 -0700 Message-Id: <1468973017-17647-11-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468973017-17647-1-git-send-email-steve_longerbeam@mentor.com> References: <1467846004-12731-1-git-send-email-steve_longerbeam@mentor.com> <1468973017-17647-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ADV7180 and ADV7182 transmit whole fields, bottom field followed by top (or vice-versa, depending on detected video standard). So for chips that do not have support for explicitly setting the field mode, set the field mode to SEQ_BT for PAL, and SEQ_TB for NTSC (there seems to be conflicting info on field order of PAL vs NTSC, so follow what is in adv7183.c). Signed-off-by: Steve Longerbeam --- v2: - the init of state->curr_norm in probe needs to be moved up, ahead of the init of state->field. --- drivers/media/i2c/adv7180.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 61f2140..58e1f53 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -718,10 +718,17 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd, switch (format->format.field) { case V4L2_FIELD_NONE: if (!(state->chip_info->flags & ADV7180_FLAG_I2P)) - format->format.field = V4L2_FIELD_INTERLACED; + format->format.field = + (state->curr_norm & V4L2_STD_525_60) ? + V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT; break; default: - format->format.field = V4L2_FIELD_INTERLACED; + if (state->chip_info->flags & ADV7180_FLAG_I2P) + format->format.field = V4L2_FIELD_INTERLACED; + else + format->format.field = + (state->curr_norm & V4L2_STD_525_60) ? + V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT; break; } @@ -1366,8 +1373,14 @@ static int adv7180_probe(struct i2c_client *client, return -ENOMEM; state->client = client; - state->field = V4L2_FIELD_INTERLACED; state->chip_info = (struct adv7180_chip_info *)id->driver_data; + state->curr_norm = V4L2_STD_NTSC; + + if (state->chip_info->flags & ADV7180_FLAG_I2P) + state->field = V4L2_FIELD_INTERLACED; + else + state->field = (state->curr_norm & V4L2_STD_525_60) ? + V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT; adv7180_of_parse(state); @@ -1397,7 +1410,6 @@ static int adv7180_probe(struct i2c_client *client, state->irq = client->irq; mutex_init(&state->mutex); - state->curr_norm = V4L2_STD_NTSC; if (state->chip_info->flags & ADV7180_FLAG_RESET_POWERED) state->powered = true; else -- 1.9.1