From patchwork Wed Nov 18 16:55:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 7651041 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 20AA09F1C2 for ; Wed, 18 Nov 2015 16:55:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4683C20454 for ; Wed, 18 Nov 2015 16:55:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75B76203B5 for ; Wed, 18 Nov 2015 16:55:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933232AbbKRQzc (ORCPT ); Wed, 18 Nov 2015 11:55:32 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:59615 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933229AbbKRQza (ORCPT ); Wed, 18 Nov 2015 11:55:30 -0500 Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1Zz612-0007Sk-Rj; Wed, 18 Nov 2015 17:55:28 +0100 From: Lucas Stach To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: kernel@pengutronix.de, patchwork-lst@pengutronix.de Subject: [PATCH 9/9] [media] tvp5150: disable output while signal not locked Date: Wed, 18 Nov 2015 17:55:28 +0100 Message-Id: <1447865728-5726-9-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447865728-5726-1-git-send-email-l.stach@pengutronix.de> References: <1447865728-5726-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.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-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 9e006bf36e67..9d03496d0af4 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,