From patchwork Wed Nov 18 16:55:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 7651021 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 619089F1C2 for ; Wed, 18 Nov 2015 16:55:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 749C820452 for ; Wed, 18 Nov 2015 16:55:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F05020454 for ; Wed, 18 Nov 2015 16:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933261AbbKRQze (ORCPT ); Wed, 18 Nov 2015 11:55:34 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:45373 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933197AbbKRQza (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-MI; 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 3/9] [media] tvp5150: determine BT.656 or YUV 4:2:2 mode from device tree Date: Wed, 18 Nov 2015 17:55:22 +0100 Message-Id: <1447865728-5726-3-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=ham 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 By looking at the endpoint flags, it can be determined whether the link should be of V4L2_MBUS_PARALLEL or V4L2_MBUS_BT656 type. Disable the dedicated HSYNC/VSYNC outputs in BT.656 mode. For devices that are not instantiated through DT the current behavior is preserved. Signed-off-by: Philipp Zabel Signed-off-by: Lucas Stach --- drivers/media/i2c/tvp5150.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index 8670b478dcd6..21cde350e385 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -11,10 +11,12 @@ #include #include #include +#include #include #include #include #include +#include #include "tvp5150_reg.h" @@ -38,6 +40,7 @@ struct tvp5150 { struct v4l2_subdev sd; struct media_pad pad; struct v4l2_ctrl_handler hdl; + enum v4l2_mbus_type bus_type; struct v4l2_mbus_framefmt format; struct v4l2_rect rect; struct regmap *regmap; @@ -424,8 +427,6 @@ static const struct i2c_reg_value tvp5150_init_enable[] = { TVP5150_MISC_CTL, 0x6f },{ /* Activates video std autodetection for all standards */ TVP5150_AUTOSW_MSK, 0x0 - },{ /* Default format: 0x47. For 4:2:2: 0x40 */ - TVP5150_DATA_RATE_SEL, 0x47 },{ TVP5150_CHROMA_PROC_CTL_1, 0x0c },{ @@ -760,6 +761,25 @@ static int tvp5150_reset(struct v4l2_subdev *sd, u32 val) /* Initializes TVP5150 to stream enabled values */ tvp5150_write_inittab(sd, tvp5150_init_enable); + switch (decoder->bus_type) { + case V4L2_MBUS_BT656: + /* 8-bit ITU BT.656 */ + regmap_update_bits(decoder->regmap, TVP5150_DATA_RATE_SEL, + 0x7, 0x7); + /* disable HSYNC, VSYNC/PALI, AVID, and FID/GLCO */ + regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, 0x4, 0x0); + break; + case V4L2_MBUS_PARALLEL: + /* 8-bit YUV 4:2:2 */ + regmap_update_bits(decoder->regmap, TVP5150_DATA_RATE_SEL, + 0x7, 0x0); + /* enable HSYNC, VSYNC/PALI, AVID, and FID/GLCO */ + regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, 0x4, 0x4); + break; + default: + return -EINVAL; + } + /* Initialize image preferences */ v4l2_ctrl_handler_setup(&decoder->hdl); @@ -1315,6 +1335,8 @@ static struct regmap_config tvp5150_config = { static int tvp5150_probe(struct i2c_client *c, const struct i2c_device_id *id) { + struct v4l2_of_endpoint bus_cfg; + struct device_node *endpoint; struct tvp5150 *core; struct v4l2_subdev *sd; struct regmap *map; @@ -1375,6 +1397,14 @@ static int tvp5150_probe(struct i2c_client *c, } } + endpoint = of_graph_get_next_endpoint(c->dev.of_node, NULL); + if (endpoint) { + v4l2_of_parse_endpoint(endpoint, &bus_cfg); + core->bus_type = bus_cfg.bus_type; + } else { + core->bus_type = V4L2_MBUS_BT656; + } + core->norm = V4L2_STD_ALL; /* Default is autodetect */ core->input = TVP5150_COMPOSITE1; core->enable = 1;