From patchwork Mon Mar 14 15:23:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 33465 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1afULh-0004lI-U6; Mon, 14 Mar 2016 15:24:01 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-6) with esmtp id 1afULf-0007Cp-6P; Mon, 14 Mar 2016 16:24:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934556AbcCNPXw (ORCPT + 1 other); Mon, 14 Mar 2016 11:23:52 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:45700 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934546AbcCNPXj (ORCPT ); Mon, 14 Mar 2016 11:23:39 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1afULK-0003LL-56; Mon, 14 Mar 2016 16:23:38 +0100 From: Lucas Stach To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: kernel@pengutronix.de, patchwork-lst@pengutronix.de Subject: [PATCH v3 9/9] [media] tvp5150: disable output while signal not locked Date: Mon, 14 Mar 2016 16:23:37 +0100 Message-Id: <1457969017-4088-9-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457969017-4088-1-git-send-email-l.stach@pengutronix.de> References: <1457969017-4088-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.3.14.151517 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0' From: Philipp Zabel To avoid short frames on stream start, keep output pins at high impedance while we are not properly locked onto the input signal. Signed-off-by: Philipp Zabel Signed-off-by: Lucas Stach --- drivers/media/i2c/tvp5150.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index b5140253b648..13ce826a4093 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -51,6 +51,7 @@ struct tvp5150 { v4l2_std_id detected_norm; u32 input; u32 output; + u32 oe; int enable; bool lock; }; @@ -809,8 +810,11 @@ static irqreturn_t tvp5150_isr(int irq, void *dev_id) if (status) { regmap_write(map, TVP5150_INT_STATUS_REG_A, status); - if (status & TVP5150_INT_A_LOCK) + if (status & TVP5150_INT_A_LOCK) { decoder->lock = !!(status & TVP5150_INT_A_LOCK_STATUS); + regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, + 0xd, decoder->lock ? decoder->oe : 0); + } return IRQ_HANDLED; } @@ -841,6 +845,7 @@ static int tvp5150_enable(struct v4l2_subdev *sd) 0x7, 0x7); /* disable HSYNC, VSYNC/PALI, AVID, and FID/GLCO */ regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, 0x4, 0x0); + decoder->oe = 0x9; break; case V4L2_MBUS_PARALLEL: /* 8-bit YUV 4:2:2 */ @@ -848,6 +853,7 @@ static int tvp5150_enable(struct v4l2_subdev *sd) 0x7, 0x0); /* enable HSYNC, VSYNC/PALI, AVID, and FID/GLCO */ regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, 0x4, 0x4); + decoder->oe = 0xd; break; default: return -EINVAL; @@ -994,9 +1000,9 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable) struct tvp5150 *decoder = container_of(sd, struct tvp5150, sd); if (enable) { - /* Enable YUV(OUT7:0), clock */ + /* Enable YUV(OUT7:0), (SYNC), clock signal, if locked */ regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, 0xd, - (decoder->bus_type == V4L2_MBUS_BT656) ? 0x9 : 0xd); + decoder->lock ? decoder->oe : 0); if (decoder->irq) { /* Enable lock interrupt */ regmap_update_bits(decoder->regmap,