From patchwork Mon Aug 3 11:39:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lad Prabhakar X-Patchwork-Id: 11697901 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8DD8913 for ; Mon, 3 Aug 2020 11:40:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 99FB120738 for ; Mon, 3 Aug 2020 11:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726356AbgHCLkG (ORCPT ); Mon, 3 Aug 2020 07:40:06 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:25127 "EHLO relmlie5.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726398AbgHCLj5 (ORCPT ); Mon, 3 Aug 2020 07:39:57 -0400 X-IronPort-AV: E=Sophos;i="5.75,429,1589209200"; d="scan'208";a="53742345" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Aug 2020 20:39:34 +0900 Received: from localhost.localdomain (unknown [10.226.36.204]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 9C0B742389C3; Mon, 3 Aug 2020 20:39:31 +0900 (JST) From: Lad Prabhakar To: Jacopo Mondi , Mauro Carvalho Chehab , Rob Herring , Hans Verkuil , Kieran Bingham , Sakari Ailus , linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Biju Das , Prabhakar , linux-renesas-soc@vger.kernel.org, Lad Prabhakar Subject: [PATCH v2 1/3] dt-bindings: media: ov772x: Document endpoint properties Date: Mon, 3 Aug 2020 12:39:11 +0100 Message-Id: <1596454753-13612-2-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1596454753-13612-1-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <1596454753-13612-1-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Document endpoint properties required for parallel interface Signed-off-by: Lad Prabhakar --- .../devicetree/bindings/media/i2c/ov772x.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Documentation/devicetree/bindings/media/i2c/ov772x.txt b/Documentation/devicetree/bindings/media/i2c/ov772x.txt index 0b3ede5b8e6a..1f4153484717 100644 --- a/Documentation/devicetree/bindings/media/i2c/ov772x.txt +++ b/Documentation/devicetree/bindings/media/i2c/ov772x.txt @@ -21,6 +21,22 @@ subnode for its digital output video port, in accordance with the video interface bindings defined in Documentation/devicetree/bindings/media/ video-interfaces.txt. +Endpoint node required properties for parallel connection are: +- remote-endpoint: a phandle to the bus receiver's endpoint node. +- bus-width: shall be set to <8> for 8 bits parallel bus + or <10> for 10 bits parallel bus +- data-shift: shall be set to <2> for 8 bits parallel bus + (lines 9:2 are used) or <0> for 10 bits parallel bus +- hsync-active: active state of the HSYNC signal, 0/1 for LOW/HIGH respectively. + (Not required for bus-type equal 6) +- vsync-active: active state of the VSYNC signal, 0/1 for LOW/HIGH respectively. + (Not required for bus-type equal 6) +- pclk-sample: sample data on rising (1) or falling (0) edge of the pixel clock + signal. (Not required for bus-type equal 6) +- bus-type: data bus type. Possible values are: + 5 - Parallel + 6 - Bt.656 + Example: &i2c0 { From patchwork Mon Aug 3 11:39:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lad Prabhakar X-Patchwork-Id: 11697907 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBD82722 for ; Mon, 3 Aug 2020 11:48:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE73220738 for ; Mon, 3 Aug 2020 11:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726610AbgHCLkN (ORCPT ); Mon, 3 Aug 2020 07:40:13 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:27969 "EHLO relmlie5.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726533AbgHCLj5 (ORCPT ); Mon, 3 Aug 2020 07:39:57 -0400 X-IronPort-AV: E=Sophos;i="5.75,429,1589209200"; d="scan'208";a="53742349" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Aug 2020 20:39:37 +0900 Received: from localhost.localdomain (unknown [10.226.36.204]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 8FBC142385FF; Mon, 3 Aug 2020 20:39:34 +0900 (JST) From: Lad Prabhakar To: Jacopo Mondi , Mauro Carvalho Chehab , Rob Herring , Hans Verkuil , Kieran Bingham , Sakari Ailus , linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Biju Das , Prabhakar , linux-renesas-soc@vger.kernel.org, Lad Prabhakar Subject: [PATCH v2 2/3] media: i2c: ov772x: Add support for BT656 mode Date: Mon, 3 Aug 2020 12:39:12 +0100 Message-Id: <1596454753-13612-3-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1596454753-13612-1-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <1596454753-13612-1-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Add support to read the bus-type and enable BT656 mode if needed. The driver defaults to parallel mode if bus-type is not specified in DT. Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das --- drivers/media/i2c/ov772x.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c index 2cc6a678069a..2de9248e3689 100644 --- a/drivers/media/i2c/ov772x.c +++ b/drivers/media/i2c/ov772x.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -434,6 +435,7 @@ struct ov772x_priv { #ifdef CONFIG_MEDIA_CONTROLLER struct media_pad pad; #endif + struct v4l2_fwnode_endpoint ep; }; /* @@ -574,6 +576,7 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable) { struct i2c_client *client = v4l2_get_subdevdata(sd); struct ov772x_priv *priv = to_ov772x(sd); + unsigned int val; int ret = 0; mutex_lock(&priv->lock); @@ -581,6 +584,22 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable) if (priv->streaming == enable) goto done; + if (priv->ep.bus_type == V4L2_MBUS_BT656 && enable) { + ret = regmap_read(priv->regmap, COM7, &val); + if (ret) + goto done; + val |= ITU656_ON_OFF; + ret = regmap_write(priv->regmap, COM7, val); + } else if (priv->ep.bus_type == V4L2_MBUS_BT656 && !enable) { + ret = regmap_read(priv->regmap, COM7, &val); + if (ret) + goto done; + val &= ~ITU656_ON_OFF; + ret = regmap_write(priv->regmap, COM7, val); + } + if (ret) + goto done; + ret = regmap_update_bits(priv->regmap, COM2, SOFT_SLEEP_MODE, enable ? 0 : SOFT_SLEEP_MODE); if (ret) @@ -1354,6 +1373,7 @@ static const struct v4l2_subdev_ops ov772x_subdev_ops = { static int ov772x_probe(struct i2c_client *client) { + struct fwnode_handle *endpoint; struct ov772x_priv *priv; int ret; static const struct regmap_config ov772x_regmap_config = { @@ -1415,6 +1435,26 @@ static int ov772x_probe(struct i2c_client *client) goto error_clk_put; } + endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev), + NULL); + if (!endpoint) { + dev_err(&client->dev, "endpoint node not found\n"); + ret = -EINVAL; + goto error_clk_put; + } + + ret = v4l2_fwnode_endpoint_parse(endpoint, &priv->ep); + fwnode_handle_put(endpoint); + if (ret) { + dev_err(&client->dev, "Could not parse endpoint\n"); + goto error_clk_put; + } + + /* fallback to parallel mode */ + if (priv->ep.bus_type != V4L2_MBUS_PARALLEL && + priv->ep.bus_type != V4L2_MBUS_BT656) + priv->ep.bus_type = V4L2_MBUS_PARALLEL; + ret = ov772x_video_probe(priv); if (ret < 0) goto error_gpio_put; From patchwork Mon Aug 3 11:39:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lad Prabhakar X-Patchwork-Id: 11697913 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 81F54722 for ; Mon, 3 Aug 2020 11:48:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7175D20775 for ; Mon, 3 Aug 2020 11:48:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726291AbgHCLsK (ORCPT ); Mon, 3 Aug 2020 07:48:10 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:36739 "EHLO relmlie5.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726534AbgHCLj4 (ORCPT ); Mon, 3 Aug 2020 07:39:56 -0400 X-IronPort-AV: E=Sophos;i="5.75,429,1589209200"; d="scan'208";a="53742353" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Aug 2020 20:39:40 +0900 Received: from localhost.localdomain (unknown [10.226.36.204]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 88BD142389C3; Mon, 3 Aug 2020 20:39:37 +0900 (JST) From: Lad Prabhakar To: Jacopo Mondi , Mauro Carvalho Chehab , Rob Herring , Hans Verkuil , Kieran Bingham , Sakari Ailus , linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Biju Das , Prabhakar , linux-renesas-soc@vger.kernel.org, Lad Prabhakar Subject: [PATCH v2 3/3] media: i2c: ov772x: Add test pattern control Date: Mon, 3 Aug 2020 12:39:13 +0100 Message-Id: <1596454753-13612-4-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1596454753-13612-1-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <1596454753-13612-1-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Add support for test pattern control supported by the sensor. Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das --- drivers/media/i2c/ov772x.c | 25 ++++++++++++++++++++++++- include/media/i2c/ov772x.h | 1 + 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c index 2de9248e3689..457887ec548d 100644 --- a/drivers/media/i2c/ov772x.c +++ b/drivers/media/i2c/ov772x.c @@ -227,7 +227,7 @@ /* COM3 */ #define SWAP_MASK (SWAP_RGB | SWAP_YUV | SWAP_ML) -#define IMG_MASK (VFLIP_IMG | HFLIP_IMG) +#define IMG_MASK (VFLIP_IMG | HFLIP_IMG | SCOLOR_TEST) #define VFLIP_IMG 0x80 /* Vertical flip image ON/OFF selection */ #define HFLIP_IMG 0x40 /* Horizontal mirror image ON/OFF selection */ @@ -425,6 +425,7 @@ struct ov772x_priv { const struct ov772x_win_size *win; struct v4l2_ctrl *vflip_ctrl; struct v4l2_ctrl *hflip_ctrl; + unsigned int test_pattern; /* band_filter = COM8[5] ? 256 - BDBASE : 0 */ struct v4l2_ctrl *band_filter_ctrl; unsigned int fps; @@ -540,6 +541,11 @@ static const struct ov772x_win_size ov772x_win_sizes[] = { }, }; +static const char * const ov772x_test_pattern_menu[] = { + "Disabled", + "Vertical Color Bar Type 1", +}; + /* * frame rate settings lists */ @@ -772,6 +778,13 @@ static int ov772x_s_frame_interval(struct v4l2_subdev *sd, return ret; } +static int ov772x_enable_test_pattern(struct ov772x_priv *priv, u32 pattern) +{ + priv->test_pattern = pattern; + return regmap_update_bits(priv->regmap, COM3, SCOLOR_TEST, + pattern ? SCOLOR_TEST : 0x00); +} + static int ov772x_s_ctrl(struct v4l2_ctrl *ctrl) { struct ov772x_priv *priv = container_of(ctrl->handler, @@ -819,6 +832,8 @@ static int ov772x_s_ctrl(struct v4l2_ctrl *ctrl) } return ret; + case V4L2_CID_TEST_PATTERN: + return ov772x_enable_test_pattern(priv, ctrl->val); } return -EINVAL; @@ -1113,10 +1128,14 @@ static int ov772x_set_params(struct ov772x_priv *priv, val |= VFLIP_IMG; if (priv->info && (priv->info->flags & OV772X_FLAG_HFLIP)) val |= HFLIP_IMG; + if (priv->info && (priv->info->flags & OV772X_FLAG_TEST_PATTERN)) + val |= SCOLOR_TEST; if (priv->vflip_ctrl->val) val ^= VFLIP_IMG; if (priv->hflip_ctrl->val) val ^= HFLIP_IMG; + if (priv->test_pattern) + val ^= SCOLOR_TEST; ret = regmap_update_bits(priv->regmap, COM3, SWAP_MASK | IMG_MASK, val); if (ret < 0) @@ -1414,6 +1433,10 @@ static int ov772x_probe(struct i2c_client *client) priv->band_filter_ctrl = v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops, V4L2_CID_BAND_STOP_FILTER, 0, 256, 1, 0); + v4l2_ctrl_new_std_menu_items(&priv->hdl, &ov772x_ctrl_ops, + V4L2_CID_TEST_PATTERN, + ARRAY_SIZE(ov772x_test_pattern_menu) - 1, + 0, 0, ov772x_test_pattern_menu); priv->subdev.ctrl_handler = &priv->hdl; if (priv->hdl.error) { ret = priv->hdl.error; diff --git a/include/media/i2c/ov772x.h b/include/media/i2c/ov772x.h index a1702d420087..65e6f8d2f4bb 100644 --- a/include/media/i2c/ov772x.h +++ b/include/media/i2c/ov772x.h @@ -12,6 +12,7 @@ /* for flags */ #define OV772X_FLAG_VFLIP (1 << 0) /* Vertical flip image */ #define OV772X_FLAG_HFLIP (1 << 1) /* Horizontal flip image */ +#define OV772X_FLAG_TEST_PATTERN (1 << 2) /* Test pattern */ /* * for Edge ctrl