From patchwork Wed Sep 30 10:51:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 67499 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kNZbo-00DIep-9l; Wed, 30 Sep 2020 10:45:17 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729247AbgI3Kvo (ORCPT + 1 other); Wed, 30 Sep 2020 06:51:44 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:58446 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725779AbgI3Kvj (ORCPT ); Wed, 30 Sep 2020 06:51:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1601463095; x=1604055095; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=y7g5Aql4+5rCpjrJRKtf2YlTYouxnKhzHWzTCuyvIwo=; b=UptPZvfZhO/ZthCzI8TKg26TFUwe/1ppN4+JlulNc7KOUxFMosWFl41HppTV5Zjx bNKYdLHdL7l4BbN8NUoXk0jD/8iJFjfArP2oS5a40U0N29RioeK+S1FlC7CPoBlO sjgqlVKy7IbaT0P8RhGatme5rqxwfCkw59njwmynml0=; X-AuditID: c39127d2-253ff70000001c25-cf-5f7463376621 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 9D.89.07205.733647F5; Wed, 30 Sep 2020 12:51:35 +0200 (CEST) Received: from lws-riedmueller.phytec.de ([172.16.23.108]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2020093012513525-526321 ; Wed, 30 Sep 2020 12:51:35 +0200 From: Stefan Riedmueller To: Laurent Pinchart Cc: Mauro Carvalho Chehab , Sakari Ailus , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Hemp , Jan Luebbe , Stefan Riedmueller Subject: [PATCH v2 1/5] media: mt9p031: Add support for 8 bit and 10 bit formats Date: Wed, 30 Sep 2020 12:51:29 +0200 Message-Id: <20200930105133.139981-1-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:35, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:35 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsWyRoCBS9c8uSTe4PBUVYuvc+axWnROXMJu cXnXHDaLng1bWS2WbfrDZPFpyzcmBzaP2R0zWT02repk85h3MtCj/6+Bx+dNcgGsUVw2Kak5 mWWpRfp2CVwZnU1nWQumKFXsvXeSvYFxkmwXIyeHhICJRO/9DuYuRi4OIYFtjBK7txxngXCu MUosufudCaSKTcBIYsG0RjBbRMBConfRdEaQImaBDiaJvk+n2boYOTiEBQIkNp/LAKlhEVCV WHxtDQuIzStgK3HpQgMTxDZ5iZmXvrNDxAUlTs58ArZMQuAKo8SN+4ehioQkTi8+ywxiMwto Syxb+Jp5AiPfLCQ9s5CkFjAyrWIUys1Mzk4tyszWK8ioLElN1ktJ3cQIDMbDE9Uv7WDsm+Nx iJGJg/EQowQHs5II76HEkngh3pTEyqrUovz4otKc1OJDjNIcLErivBt4S8KEBNITS1KzU1ML UotgskwcnFINjHE5v/p1V0jP7NjSyLuW6eAPiZ0TvIMc/02t4Tn9XWHaJE5exyeZc7e8PPfC +pTcy9RfT71KDb/PkHa7eeF5tGiANkPapp1ZDd8sGXcxmRjqTa/6sM5hRf7Luf/FVxt4MPNn d/zfFPzrGUvr5myvIDEprVZRmaC2vlXSa2QZ3t5X5pE+w5khpcRSnJFoqMVcVJwIABtfCjY0 AgAA Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.3 (--) X-LSpam-Report: No, score=-2.3 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,T_DKIM_INVALID=0.01 autolearn=ham autolearn_force=no From: Christian Hemp Aside from 12 bit monochrome or color format the sensor implicitly supports 10 and 8 bit formats as well by simply dropping the corresponding LSBs. Signed-off-by: Christian Hemp [jlu@pengutronix.de: simplified by dropping v4l2_colorspace handling] Signed-off-by: Jan Luebbe Signed-off-by: Stefan Riedmueller --- Changes in v2: - Use unsigned int for num_fmts and loop variable in find_datafmt - Remove superfluous const qualifier from find_datafmt --- drivers/media/i2c/mt9p031.c | 50 +++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index dc23b9ed510a..2e6671ef877c 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -116,6 +116,18 @@ enum mt9p031_model { MT9P031_MODEL_MONOCHROME, }; +static const u32 mt9p031_color_fmts[] = { + MEDIA_BUS_FMT_SGRBG8_1X8, + MEDIA_BUS_FMT_SGRBG10_1X10, + MEDIA_BUS_FMT_SGRBG12_1X12, +}; + +static const u32 mt9p031_monochrome_fmts[] = { + MEDIA_BUS_FMT_Y8_1X8, + MEDIA_BUS_FMT_Y10_1X10, + MEDIA_BUS_FMT_Y12_1X12, +}; + struct mt9p031 { struct v4l2_subdev subdev; struct media_pad pad; @@ -138,6 +150,9 @@ struct mt9p031 { struct v4l2_ctrl *blc_auto; struct v4l2_ctrl *blc_offset; + const u32 *fmts; + unsigned int num_fmts; + /* Registers cache */ u16 output_control; u16 mode2; @@ -148,6 +163,17 @@ static struct mt9p031 *to_mt9p031(struct v4l2_subdev *sd) return container_of(sd, struct mt9p031, subdev); } +static u32 mt9p031_find_datafmt(struct mt9p031 *mt9p031, u32 code) +{ + unsigned int i; + + for (i = 0; i < mt9p031->num_fmts; i++) + if (mt9p031->fmts[i] == code) + return mt9p031->fmts[i]; + + return mt9p031->fmts[mt9p031->num_fmts-1]; +} + static int mt9p031_read(struct i2c_client *client, u8 reg) { return i2c_smbus_read_word_swapped(client, reg); @@ -476,10 +502,11 @@ static int mt9p031_enum_mbus_code(struct v4l2_subdev *subdev, { struct mt9p031 *mt9p031 = to_mt9p031(subdev); - if (code->pad || code->index) + if (code->pad || code->index >= mt9p031->num_fmts) return -EINVAL; - code->code = mt9p031->format.code; + code->code = mt9p031->fmts[code->index]; + return 0; } @@ -573,6 +600,8 @@ static int mt9p031_set_format(struct v4l2_subdev *subdev, __format->width = __crop->width / hratio; __format->height = __crop->height / vratio; + __format->code = mt9p031_find_datafmt(mt9p031, format->format.code); + format->format = *__format; return 0; @@ -951,10 +980,7 @@ static int mt9p031_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) format = v4l2_subdev_get_try_format(subdev, fh->pad, 0); - if (mt9p031->model == MT9P031_MODEL_MONOCHROME) - format->code = MEDIA_BUS_FMT_Y12_1X12; - else - format->code = MEDIA_BUS_FMT_SGRBG12_1X12; + format->code = mt9p031_find_datafmt(mt9p031, 0); format->width = MT9P031_WINDOW_WIDTH_DEF; format->height = MT9P031_WINDOW_HEIGHT_DEF; @@ -1121,10 +1147,14 @@ static int mt9p031_probe(struct i2c_client *client, mt9p031->crop.left = MT9P031_COLUMN_START_DEF; mt9p031->crop.top = MT9P031_ROW_START_DEF; - if (mt9p031->model == MT9P031_MODEL_MONOCHROME) - mt9p031->format.code = MEDIA_BUS_FMT_Y12_1X12; - else - mt9p031->format.code = MEDIA_BUS_FMT_SGRBG12_1X12; + if (mt9p031->model == MT9P031_MODEL_MONOCHROME) { + mt9p031->fmts = mt9p031_monochrome_fmts; + mt9p031->num_fmts = ARRAY_SIZE(mt9p031_monochrome_fmts); + } else { + mt9p031->fmts = mt9p031_color_fmts; + mt9p031->num_fmts = ARRAY_SIZE(mt9p031_color_fmts); + } + mt9p031->format.code = mt9p031_find_datafmt(mt9p031, 0); mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF; mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF; From patchwork Wed Sep 30 10:51:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 67500 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kNZbp-00DIep-MX; Wed, 30 Sep 2020 10:45:19 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729617AbgI3Kvp (ORCPT + 1 other); Wed, 30 Sep 2020 06:51:45 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:58446 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729205AbgI3Kvp (ORCPT ); Wed, 30 Sep 2020 06:51:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1601463099; x=1604055099; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dzg7oLQPWCGjeAIksjtJZdy7ElG4yvKdUuApBlBIjbg=; b=c78Wx227XDwx+Z777O6T43ECjiHQtO+Cjxw2YJWXsVMi6+MWGUnA6OoNLUPM5FG2 RBsSHepIYKGN4U+5HnZcT8w/8/9VHzTOEV7awSaBNXYudCK2FRC/2K5oXAPnOV9f B3p2s7tocVT98iDi33jQKqVGRJHKi82ljqeqwI7hvPk=; X-AuditID: c39127d2-269ff70000001c25-d0-5f74633b52a9 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 0E.89.07205.B33647F5; Wed, 30 Sep 2020 12:51:39 +0200 (CEST) Received: from lws-riedmueller.phytec.de ([172.16.23.108]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2020093012513957-526322 ; Wed, 30 Sep 2020 12:51:39 +0200 From: Stefan Riedmueller To: Laurent Pinchart Cc: Mauro Carvalho Chehab , Sakari Ailus , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Enrico Scholz , Stefan Riedmueller Subject: [PATCH v2 2/5] media: mt9p031: Read back the real clock rate Date: Wed, 30 Sep 2020 12:51:30 +0200 Message-Id: <20200930105133.139981-2-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930105133.139981-1-s.riedmueller@phytec.de> References: <20200930105133.139981-1-s.riedmueller@phytec.de> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:39, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:39 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGLMWRmVeSWpSXmKPExsWyRoCBS9c6uSTeYFGnqcXeYxdYLDonLmG3 uLxrDptFz4atrBbLNv1hsvi05RuTA5vH7I6ZrB6bVnWyecw7GeixYuV/Jo/Pm+QCWKO4bFJS czLLUov07RK4Mk52cBRM4694tfs/UwPjLZ4uRg4OCQETiSc7lLoYOTmEBLYxSnz6E93FyAVk X2OUWPbqMgtIgk3ASGLBtEYmEFtEwEKid9F0RhCbWeAro8S6s9kgtrCAq0R/xzFmEJtFQFXi 5J5pbCA2r4CtxIxjv1lBbAkBeYmZl76zg9icAnYSp+//YgW5QQio5uLkLIhyQYmTM5+wgNwg IXCFUeLCxhVQvUISpxefZYbYqy2xbOFr5gmMArOQ9MxCklrAyLSKUSg3Mzk7tSgzW68go7Ik NVkvJXUTIzBsD09Uv7SDsW+OxyFGJg7GQ4wSHMxKIryHEkvihXhTEiurUovy44tKc1KLDzFK c7AoifNu4C0JExJITyxJzU5NLUgtgskycXBKNTDGyXVyGnc/0Do57YLIHo5Jm3qNymen/imY 1j577sbr+zcKhdZt2j63+EHKl7bkPR78bgEZJ1zFthQee+Rc9OtWHXdIo7NzRFQdV9/xyVMs F6tMY1xk/9Lt9NniVyHx50xvGinlrK1Y8rNoca7jjSC9tZsfbSiI/p4+QTvozYPtP78y/att WVGtxFKckWioxVxUnAgA9L/RdUkCAAA= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.3 (--) X-LSpam-Report: No, score=-2.3 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,T_DKIM_INVALID=0.01 autolearn=ham autolearn_force=no From: Enrico Scholz The real and requested clock can differ and because it is used to calculate PLL values, the real clock rate should be read. Signed-off-by: Enrico Scholz Signed-off-by: Stefan Riedmueller Reviewed-by: Laurent Pinchart --- No changes in v2 --- drivers/media/i2c/mt9p031.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index 2e6671ef877c..b4c042f418c1 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -255,6 +255,7 @@ static int mt9p031_clk_setup(struct mt9p031 *mt9p031) struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); struct mt9p031_platform_data *pdata = mt9p031->pdata; + unsigned long ext_freq; int ret; mt9p031->clk = devm_clk_get(&client->dev, NULL); @@ -265,13 +266,15 @@ static int mt9p031_clk_setup(struct mt9p031 *mt9p031) if (ret < 0) return ret; + ext_freq = clk_get_rate(mt9p031->clk); + /* If the external clock frequency is out of bounds for the PLL use the * pixel clock divider only and disable the PLL. */ - if (pdata->ext_freq > limits.ext_clock_max) { + if (ext_freq > limits.ext_clock_max) { unsigned int div; - div = DIV_ROUND_UP(pdata->ext_freq, pdata->target_freq); + div = DIV_ROUND_UP(ext_freq, pdata->target_freq); div = roundup_pow_of_two(div) / 2; mt9p031->clk_div = min_t(unsigned int, div, 64); @@ -280,7 +283,7 @@ static int mt9p031_clk_setup(struct mt9p031 *mt9p031) return 0; } - mt9p031->pll.ext_clock = pdata->ext_freq; + mt9p031->pll.ext_clock = ext_freq; mt9p031->pll.pix_clock = pdata->target_freq; mt9p031->use_pll = true; From patchwork Wed Sep 30 10:51:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 67501 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kNZbz-00DIfc-Pi; Wed, 30 Sep 2020 10:45:28 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729682AbgI3Kvz (ORCPT + 1 other); Wed, 30 Sep 2020 06:51:55 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:58446 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725779AbgI3Kvw (ORCPT ); Wed, 30 Sep 2020 06:51:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1601463108; x=1604055108; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EBbV7tZj+aMHE+es+7w9+LXsXZ9jLst9SC6njbjHeSk=; b=iGNY+yHmYmHs5Onap3bi9z3z7exnPgR0U5bjBeL1WmjgnGIKDks5uHA7Ac4T4dU0 wuwpM0benMOUYD6kX2kj6DqIZn887MNb6Xcuz75+nDX6espZCOEtxCUgl3m4qL1H NTiQJoOV2k/v316Uo+SbWan5WfIoMUo+UsphBX0V24Y=; X-AuditID: c39127d2-269ff70000001c25-d3-5f7463445290 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id BE.89.07205.443647F5; Wed, 30 Sep 2020 12:51:48 +0200 (CEST) Received: from lws-riedmueller.phytec.de ([172.16.23.108]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2020093012514771-526325 ; Wed, 30 Sep 2020 12:51:47 +0200 From: Stefan Riedmueller To: Laurent Pinchart Cc: Mauro Carvalho Chehab , Sakari Ailus , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Enrico Scholz , Stefan Riedmueller Subject: [PATCH v2 3/5] media: mt9p031: Implement [gs]_register debug calls Date: Wed, 30 Sep 2020 12:51:31 +0200 Message-Id: <20200930105133.139981-3-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930105133.139981-1-s.riedmueller@phytec.de> References: <20200930105133.139981-1-s.riedmueller@phytec.de> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:47, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:47 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrBLMWRmVeSWpSXmKPExsWyRoCBS9cluSTe4NQlRou9xy6wWHROXMJu cXnXHDaLng1bWS2WbfrDZPFpyzcmBzaP2R0zWT02repk85h3MtBjxcr/TB6fN8kFsEZx2aSk 5mSWpRbp2yVwZXRfP81aMJ+/YtuUTawNjO95uhg5OSQETCSWzFjBCGILCWxjlDjQltDFyAVk X2OU2NA/iw0kwSZgJLFgWiMTiC0iYCHRu2g6WAOzwFdGiXVns0FsYQFvibPLX7OD2CwCqhIv JswAq+cVsJVY/m87C8QyeYmZl76D1XAK2Emcvv+LtYuRA2iZrcTFyVkQ5YISJ2c+YQG5QULg CqPE1pUXmCF6hSROLz7LDLFXW2LZwtfMExgFZiHpmYUktYCRaRWjUG5mcnZqUWa2XkFGZUlq sl5K6iZGYOgenqh+aQdj3xyPQ4xMHIyHGCU4mJVEeA8llsQL8aYkVlalFuXHF5XmpBYfYpTm YFES593AWxImJJCeWJKanZpakFoEk2Xi4JRqYNzD27rj0g6V/hVNDeYcVjJbD2yu6PonEPBq c7f0/KAYxnvW/64Ftb77n+EcKK/Qk3gs7bhF9MEm4YIfrqsZ5fw1Ps7I1PxsekIy8OFmBmON 1+In75epf2D6r/Wi9Nek2hseby5azoxY/zMn0H2esPqf/JJ7VRtN/y08X3nnhZLqR/+mCM1j 65VYijMSDbWYi4oTAdQ8ZrdLAgAA Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.3 (--) X-LSpam-Report: No, score=-2.3 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,T_DKIM_INVALID=0.01 autolearn=ham autolearn_force=no From: Enrico Scholz Implement g_register and s_register v4l2_subdev_core_ops to access camera register directly from userspace for debug purposes. Signed-off-by: Enrico Scholz Signed-off-by: Stefan Riedmueller --- No changes in v2 --- drivers/media/i2c/mt9p031.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index b4c042f418c1..de36025260a8 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -703,6 +703,30 @@ static int mt9p031_restore_blc(struct mt9p031 *mt9p031) return 0; } +#ifdef CONFIG_VIDEO_ADV_DEBUG +static int mt9p031_g_register(struct v4l2_subdev *sd, + struct v4l2_dbg_register *reg) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + int ret; + + ret = mt9p031_read(client, reg->reg); + if (ret < 0) + return ret; + + reg->val = ret; + return 0; +} + +static int mt9p031_s_register(struct v4l2_subdev *sd, + struct v4l2_dbg_register const *reg) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + + return mt9p031_write(client, reg->reg, reg->val); +} +#endif + static int mt9p031_s_ctrl(struct v4l2_ctrl *ctrl) { struct mt9p031 *mt9p031 = @@ -1000,6 +1024,10 @@ static int mt9p031_close(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) static const struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { .s_power = mt9p031_set_power, +#ifdef CONFIG_VIDEO_ADV_DEBUG + .s_register = mt9p031_s_register, + .g_register = mt9p031_g_register, +#endif }; static const struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { From patchwork Wed Sep 30 10:51:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 67502 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kNZc2-00DIfc-78; Wed, 30 Sep 2020 10:45:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729304AbgI3Kv7 (ORCPT + 1 other); Wed, 30 Sep 2020 06:51:59 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:58446 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729643AbgI3Kv4 (ORCPT ); Wed, 30 Sep 2020 06:51:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1601463114; x=1604055114; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8Ne0Cho+Zmb2A9HZaNjT+Nce0O3XMfwK2n40tLuNhBo=; b=T/ZxTko4U9TO4DTF93T7JZ6IDG6lcDrC+hAZXTZ0kCg+859hv3NDR+oV6EhsLk+k LpaIiY7OPHNwSBY+TXQmM/XYA1sH58JPieHrD10gHOzRioH/lWe1ONZmhUFNrpyl cmeA2hUb7pRw01ZXzPpzjx/9NGfI/3GMiFNy+Aun/EY=; X-AuditID: c39127d2-253ff70000001c25-d4-5f74634a4d88 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 2F.89.07205.A43647F5; Wed, 30 Sep 2020 12:51:54 +0200 (CEST) Received: from lws-riedmueller.phytec.de ([172.16.23.108]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2020093012515375-526326 ; Wed, 30 Sep 2020 12:51:53 +0200 From: Stefan Riedmueller To: Laurent Pinchart Cc: Mauro Carvalho Chehab , Sakari Ailus , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Hemp , Stefan Riedmueller Subject: [PATCH v2 4/5] media: mt9p031: Make pixel clock polarity configurable by DT Date: Wed, 30 Sep 2020 12:51:32 +0200 Message-Id: <20200930105133.139981-4-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930105133.139981-1-s.riedmueller@phytec.de> References: <20200930105133.139981-1-s.riedmueller@phytec.de> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:53, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:54 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRoCBS9cruSTeYMtdFovOiUvYLS7vmsNm 0bNhK6vFsk1/mCw+bfnG5MDqMbtjJqvHplWdbB7zTgZ6fN4kF8ASxWWTkpqTWZZapG+XwJXR euc3a8Eh6Yo1q44yNzAuFu9i5OSQEDCRmH/wMzOILSSwjVHi70z5LkYuIPsao8TJD2vZQRJs AkYSC6Y1MoHYIgIWEr2LpjOCFDELPGeUmLN9FyNIQlggROL3jh5WEJtFQFXifutqNhCbV8BW 4l/rDlaIbfISMy99BxvKKWAncfr+L6A4B9A2W4mLk7MgygUlTs58wgIyX0LgCqPElGvPmSB6 hSROLz4LdimzgLbEsoWvmScwCsxC0jMLSWoBI9MqRqHczOTs1KLMbL2CjMqS1GS9lNRNjMBA PTxR/dIOxr45HocYmTgYDzFKcDArifAeSiyJF+JNSaysSi3Kjy8qzUktPsQozcGiJM67gbck TEggPbEkNTs1tSC1CCbLxMEp1cCYwz3RRKjQfGLR5k1ymutOWKfEtZcGm+oWaU9/+uTCy0S7 S+kzzCa/XHV20SW9hHXyxwvYHtnUKf/7WtnvN7+lwHG5t++i9IlennYXBW8KqQhV3rY/mDRz Sliyw+qjb+6wL99YxPL7kvmRszO5WtadPqL9YCcHq7fVpVVLnBUFv8/2VJw+gbNRiaU4I9FQ i7moOBEA6E/jSkICAAA= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.3 (--) X-LSpam-Report: No, score=-2.3 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,T_DKIM_INVALID=0.01 autolearn=ham autolearn_force=no From: Christian Hemp Evaluate the desired pixel clock polarity from the device tree. Signed-off-by: Christian Hemp Signed-off-by: Stefan Riedmueller --- Changes in v2: - Initialise endpoint bus_type field to V4L2_MBUS_PARALLEL since the sensor only supports a parallel interface --- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/mt9p031.c | 20 +++++++++++++++++++- include/media/i2c/mt9p031.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index c7ba76fee599..7c026daeacf0 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -1103,6 +1103,7 @@ config VIDEO_MT9P031 select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEO_APTINA_PLL + select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the Aptina (Micron) mt9p031 5 Mpixel camera. diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index de36025260a8..d10457361e6c 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "aptina-pll.h" @@ -399,6 +400,14 @@ static int __mt9p031_set_power(struct mt9p031 *mt9p031, bool on) return ret; } + /* Configure the pixel clock polarity */ + if (mt9p031->pdata && mt9p031->pdata->pixclk_pol) { + ret = mt9p031_write(client, MT9P031_PIXEL_CLOCK_CONTROL, + MT9P031_PIXEL_CLOCK_INVERT); + if (ret < 0) + return ret; + } + return v4l2_ctrl_handler_setup(&mt9p031->ctrls); } @@ -1062,8 +1071,11 @@ static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { static struct mt9p031_platform_data * mt9p031_get_pdata(struct i2c_client *client) { - struct mt9p031_platform_data *pdata; + struct mt9p031_platform_data *pdata = NULL; struct device_node *np; + struct v4l2_fwnode_endpoint endpoint = { + .bus_type = V4L2_MBUS_PARALLEL + }; if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node) return client->dev.platform_data; @@ -1072,6 +1084,9 @@ mt9p031_get_pdata(struct i2c_client *client) if (!np) return NULL; + if (v4l2_fwnode_endpoint_parse(of_fwnode_handle(np), &endpoint) < 0) + goto done; + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) goto done; @@ -1079,6 +1094,9 @@ mt9p031_get_pdata(struct i2c_client *client) of_property_read_u32(np, "input-clock-frequency", &pdata->ext_freq); of_property_read_u32(np, "pixel-clock-frequency", &pdata->target_freq); + pdata->pixclk_pol = !!(endpoint.bus.parallel.flags & + V4L2_MBUS_PCLK_SAMPLE_RISING); + done: of_node_put(np); return pdata; diff --git a/include/media/i2c/mt9p031.h b/include/media/i2c/mt9p031.h index 7c29c53aa988..f933cd0be8e5 100644 --- a/include/media/i2c/mt9p031.h +++ b/include/media/i2c/mt9p031.h @@ -10,6 +10,7 @@ struct v4l2_subdev; * @target_freq: Pixel clock frequency */ struct mt9p031_platform_data { + unsigned int pixclk_pol:1; int ext_freq; int target_freq; }; From patchwork Wed Sep 30 10:51:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Riedm=C3=BCller?= X-Patchwork-Id: 67503 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kNZcB-00DIgT-WE; Wed, 30 Sep 2020 10:45:40 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729707AbgI3KwE (ORCPT + 1 other); Wed, 30 Sep 2020 06:52:04 -0400 Received: from mickerik.phytec.de ([195.145.39.210]:58446 "EHLO mickerik.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729240AbgI3KwB (ORCPT ); Wed, 30 Sep 2020 06:52:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a1; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1601463117; x=1604055117; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=G1/2BgyoatPHnSiyT4dMVmNoh+3yE3VQGZZbZjWFxEE=; b=IwLd0ZR8hNyaQZfPVFo53elt7EYCrrapYBgDAV6IDXe/h9X+n/OK8L1+Ok8PfjCt SRjpm9iBeh3z0oJ3+nmuh8dIMHj2oe69Q5lKM1uBv0dM8jpQoERNXlMHcsfjKc7p sv7bm/4PdskKiwoml74GYTvOuXQH9lbdXIIIh/SzZbg=; X-AuditID: c39127d2-269ff70000001c25-d5-5f74634c7008 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 8F.89.07205.C43647F5; Wed, 30 Sep 2020 12:51:56 +0200 (CEST) Received: from lws-riedmueller.phytec.de ([172.16.23.108]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2020093012515660-526327 ; Wed, 30 Sep 2020 12:51:56 +0200 From: Stefan Riedmueller To: Laurent Pinchart Cc: Mauro Carvalho Chehab , Sakari Ailus , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Dirk Bender , Stefan Riedmueller Subject: [PATCH v2 5/5] media: mt9p031: Fix corrupted frame after restarting stream Date: Wed, 30 Sep 2020 12:51:33 +0200 Message-Id: <20200930105133.139981-5-s.riedmueller@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930105133.139981-1-s.riedmueller@phytec.de> References: <20200930105133.139981-1-s.riedmueller@phytec.de> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:56, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 30.09.2020 12:51:56 X-TNEFEvaluated: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRoCBS9cnuSTe4PV5a4vOiUvYLS7vmsNm 0bNhK6vFsk1/mCw+bfnG5MDqMbtjJqvHplWdbB7zTgZ6fN4kF8ASxWWTkpqTWZZapG+XwJXR s/o0W8EDkYqv+/ewNDBOE+xi5OSQEDCRePhyM3MXIxeHkMA2Rom3Ty+zgCSEBK4xSsy+aQJi swkYSSyY1sgEYosIWEj0LprOCNLALPCMUaK9rZUNJCEsECyxakEDmM0ioCpxdH0vM4jNK2Ar 8Xj/cWaIbfISMy99ZwexOQXsJE7f/8XaxcgBtMxW4uLkLIhyQYmTM5+wgMyXELjCKNHx9iwb RK+QxOnFZ8HmMAtoSyxb+Jp5AqPALCQ9s5CkFjAyrWIUys1Mzk4tyszWK8ioLElN1ktJ3cQI DNTDE9Uv7WDsm+NxiJGJg/EQowQHs5II76HEkngh3pTEyqrUovz4otKc1OJDjNIcLErivBt4 S8KEBNITS1KzU1MLUotgskwcnFINjJOXLVWazbB2L59mgXr1sue3Wqafuxm52fTnoal8e0Nz l/d2fHZ9YZD2r7Xfbtsh0defl/NfEhea5vFsV93HeVsfu7fI2By/w2R+I/6p4MnI7vmluxjL l/4yOyt0TbqkdhV302V3XeWbspOuzC7/UGj92SOsfU7ypjbWp3Fdy6XUs7LuTFl6OEmJpTgj 0VCLuag4EQBubmDKQgIAAA== Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.3 (--) X-LSpam-Report: No, score=-2.3 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,T_DKIM_INVALID=0.01 autolearn=ham autolearn_force=no From: Dirk Bender To prevent corrupted frames after starting and stopping the sensor it's datasheet specifies a specific pause sequence to follow: Stopping: Set Pause_Restart Bit -> Set Restart Bit -> Set Chip_Enable Off Restarting: Set Chip_Enable On -> Clear Pause_Restart Bit The Restart Bit is cleared automatically and must not be cleared manually as this would cause undefined behavior. Signed-off-by: Dirk Bender Signed-off-by: Stefan Riedmueller --- No changes in v2 --- drivers/media/i2c/mt9p031.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index d10457361e6c..d59f66e3dcf3 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -80,6 +80,8 @@ #define MT9P031_PIXEL_CLOCK_SHIFT(n) ((n) << 8) #define MT9P031_PIXEL_CLOCK_DIVIDE(n) ((n) << 0) #define MT9P031_FRAME_RESTART 0x0b +#define MT9P031_FRAME_RESTART_SET (1 << 0) +#define MT9P031_FRAME_PAUSE_RESTART_SET (1 << 1) #define MT9P031_SHUTTER_DELAY 0x0c #define MT9P031_RST 0x0d #define MT9P031_RST_ENABLE 1 @@ -483,9 +485,25 @@ static int mt9p031_set_params(struct mt9p031 *mt9p031) static int mt9p031_s_stream(struct v4l2_subdev *subdev, int enable) { struct mt9p031 *mt9p031 = to_mt9p031(subdev); + struct i2c_client *client = v4l2_get_subdevdata(subdev); + int val; int ret; if (!enable) { + val = mt9p031_read(client, MT9P031_FRAME_RESTART); + + /* enable pause restart */ + val |= MT9P031_FRAME_PAUSE_RESTART_SET; + ret = mt9p031_write(client, MT9P031_FRAME_RESTART, val); + if (ret < 0) + return ret; + + /* enable restart + keep pause restart set */ + val |= MT9P031_FRAME_RESTART_SET; + ret = mt9p031_write(client, MT9P031_FRAME_RESTART, val); + if (ret < 0) + return ret; + /* Stop sensor readout */ ret = mt9p031_set_output_control(mt9p031, MT9P031_OUTPUT_CONTROL_CEN, 0); @@ -505,6 +523,13 @@ static int mt9p031_s_stream(struct v4l2_subdev *subdev, int enable) if (ret < 0) return ret; + val = mt9p031_read(client, MT9P031_FRAME_RESTART); + /* disable reset + pause restart */ + val &= ~MT9P031_FRAME_PAUSE_RESTART_SET; + ret = mt9p031_write(client, MT9P031_FRAME_RESTART, val); + if (ret < 0) + return ret; + return mt9p031_pll_enable(mt9p031); }