From patchwork Tue Dec 19 09:30:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 10122825 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F0F9E60390 for ; Tue, 19 Dec 2017 09:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E726A28A00 for ; Tue, 19 Dec 2017 09:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBB0828B36; Tue, 19 Dec 2017 09:31:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29DB828A00 for ; Tue, 19 Dec 2017 09:31:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759879AbdLSJbd (ORCPT ); Tue, 19 Dec 2017 04:31:33 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:60873 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759495AbdLSJbd (ORCPT ); Tue, 19 Dec 2017 04:31:33 -0500 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1eREE8-0002n6-0Z; Tue, 19 Dec 2017 10:30:20 +0100 Message-ID: <1513675815.7538.4.camel@pengutronix.de> Subject: Re: [PATCH 5/8] media: v4l2-mediabus: convert flags to enums and document them From: Philipp Zabel To: Mauro Carvalho Chehab , Linux Media Mailing List Cc: Mauro Carvalho Chehab , Lars-Peter Clausen , Guennadi Liakhovetski , Mats Randgaard , Niklas =?ISO-8859-1?Q?S=F6derlund?= , Bhumika Goyal , Hans Verkuil , Sakari Ailus , Julia Lawall , Fabio Estevam , Janusz Krzysztofik , Markus Elfring , Laurent Pinchart , "Gustavo A. R. Silva" , Petr Cvek , Sylwester Nawrocki , Arnd Bergmann , Sebastian Reichel , Tomasz Figa , linux-renesas-soc@vger.kernel.org Date: Tue, 19 Dec 2017 10:30:15 +0100 In-Reply-To: <9adfe443125040ddef985c698a18a2404e5a638d.1513625884.git.mchehab@s-opensource.com> References: <9adfe443125040ddef985c698a18a2404e5a638d.1513625884.git.mchehab@s-opensource.com> X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-renesas-soc@vger.kernel.org Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Mauro, On Mon, 2017-12-18 at 17:53 -0200, Mauro Carvalho Chehab wrote: > There is a mess with media bus flags: there are two sets of > flags, one used by parallel and ITU-R BT.656 outputs, > and another one for CSI2. > > Depending on the type, the same bit has different meanings. > > That's very confusing, and counter-intuitive. So, split them > into two sets of flags, inside an enum. > > This way, it becomes clearer that there are two separate sets > of flags. It also makes easier if CSI1, CSP, CSI3, etc. would > need a different set of flags. > > As a side effect, enums can be documented via kernel-docs, > so there will be an improvement at flags documentation. > > Unfortunately, soc_camera and pxa_camera do a mess with > the flags, using either one set of flags without proper > checks about the type. That could be fixed, but, as both drivers > are obsolete and in the process of cleanings, I opted to just > keep the behavior, using an unsigned int inside those two > drivers. > > Acked-by: Hans Verkuil > Signed-off-by: Mauro Carvalho Chehab If I am not mistaken this is missing a conversion of drivers/staging/media/imx/imx-media-csi.c: --------8<-------- -------->8-------- regards Philipp > --- > drivers/media/i2c/adv7180.c | 10 +- > drivers/media/i2c/ml86v7667.c | 5 +- > drivers/media/i2c/mt9m111.c | 8 +- > drivers/media/i2c/ov6650.c | 19 +-- > drivers/media/i2c/soc_camera/imx074.c | 6 +- > drivers/media/i2c/soc_camera/mt9m001.c | 10 +- > drivers/media/i2c/soc_camera/mt9t031.c | 11 +- > drivers/media/i2c/soc_camera/mt9t112.c | 11 +- > drivers/media/i2c/soc_camera/mt9v022.c | 16 ++- > drivers/media/i2c/soc_camera/ov5642.c | 5 +- > drivers/media/i2c/soc_camera/ov772x.c | 10 +- > drivers/media/i2c/soc_camera/ov9640.c | 10 +- > drivers/media/i2c/soc_camera/ov9740.c | 10 +- > drivers/media/i2c/soc_camera/rj54n1cb0c.c | 12 +- > drivers/media/i2c/soc_camera/tw9910.c | 13 +- > drivers/media/i2c/tc358743.c | 10 +- > drivers/media/i2c/tvp5150.c | 6 +- > drivers/media/platform/pxa_camera.c | 8 +- > drivers/media/platform/rcar-vin/rcar-core.c | 4 +- > drivers/media/platform/rcar-vin/rcar-dma.c | 4 +- > .../platform/soc_camera/sh_mobile_ceu_camera.c | 2 +- > drivers/media/platform/soc_camera/soc_camera.c | 3 +- > .../platform/soc_camera/soc_camera_platform.c | 2 +- > drivers/media/platform/soc_camera/soc_mediabus.c | 2 +- > drivers/media/v4l2-core/v4l2-fwnode.c | 5 +- > include/media/v4l2-fwnode.h | 4 +- > include/media/v4l2-mediabus.h | 145 ++++++++++++++------- > 27 files changed, 218 insertions(+), 133 deletions(-) > > diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c > index 25d24a3f10a7..4bf25a72ef4f 100644 > --- a/drivers/media/i2c/adv7180.c > +++ b/drivers/media/i2c/adv7180.c > @@ -743,16 +743,16 @@ static int adv7180_g_mbus_config(struct v4l2_subdev *sd, > > if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) { > cfg->type = V4L2_MBUS_CSI2; > - cfg->flags = V4L2_MBUS_CSI2_1_LANE | > - V4L2_MBUS_CSI2_CHANNEL_0 | > - V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > + cfg->csi2_flags = V4L2_MBUS_CSI2_1_LANE > + | V4L2_MBUS_CSI2_CHANNEL_0 > + | V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > } else { > /* > * The ADV7180 sensor supports BT.601/656 output modes. > * The BT.656 is default and not yet configurable by s/w. > */ > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_BT656; > } > > diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c > index 57ef901edb06..a25114d0c31f 100644 > --- a/drivers/media/i2c/ml86v7667.c > +++ b/drivers/media/i2c/ml86v7667.c > @@ -226,8 +226,9 @@ static int ml86v7667_fill_fmt(struct v4l2_subdev *sd, > static int ml86v7667_g_mbus_config(struct v4l2_subdev *sd, > struct v4l2_mbus_config *cfg) > { > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_BT656; > > return 0; > diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c > index b1665d97e0fd..d9698b535080 100644 > --- a/drivers/media/i2c/mt9m111.c > +++ b/drivers/media/i2c/mt9m111.c > @@ -857,9 +857,11 @@ static int mt9m111_enum_mbus_code(struct v4l2_subdev *sd, > static int mt9m111_g_mbus_config(struct v4l2_subdev *sd, > struct v4l2_mbus_config *cfg) > { > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > > return 0; > diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c > index 8975d16b2b24..61223bbe077e 100644 > --- a/drivers/media/i2c/ov6650.c > +++ b/drivers/media/i2c/ov6650.c > @@ -880,11 +880,14 @@ static int ov6650_g_mbus_config(struct v4l2_subdev *sd, > struct v4l2_mbus_config *cfg) > { > > - cfg->flags = V4L2_MBUS_MASTER | > - V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_PCLK_SAMPLE_FALLING > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_LOW > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_LOW > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > > return 0; > @@ -897,21 +900,21 @@ static int ov6650_s_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > int ret; > > - if (cfg->flags & V4L2_MBUS_PCLK_SAMPLE_RISING) > + if (cfg->pb_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) > ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_PCLK_RISING, 0); > else > ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_PCLK_RISING); > if (ret) > return ret; > > - if (cfg->flags & V4L2_MBUS_HSYNC_ACTIVE_LOW) > + if (cfg->pb_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW) > ret = ov6650_reg_rmw(client, REG_COMF, COMF_HREF_LOW, 0); > else > ret = ov6650_reg_rmw(client, REG_COMF, 0, COMF_HREF_LOW); > if (ret) > return ret; > > - if (cfg->flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) > + if (cfg->pb_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) > ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_VSYNC_HIGH, 0); > else > ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_VSYNC_HIGH); > diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c > index 77f1e0243d6e..f52d64e31975 100644 > --- a/drivers/media/i2c/soc_camera/imx074.c > +++ b/drivers/media/i2c/soc_camera/imx074.c > @@ -264,9 +264,9 @@ static int imx074_g_mbus_config(struct v4l2_subdev *sd, > struct v4l2_mbus_config *cfg) > { > cfg->type = V4L2_MBUS_CSI2; > - cfg->flags = V4L2_MBUS_CSI2_2_LANE | > - V4L2_MBUS_CSI2_CHANNEL_0 | > - V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > + cfg->csi2_flags = V4L2_MBUS_CSI2_2_LANE > + | V4L2_MBUS_CSI2_CHANNEL_0 > + | V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c > index 1bfb0d53059e..91545e8160b7 100644 > --- a/drivers/media/i2c/soc_camera/mt9m001.c > +++ b/drivers/media/i2c/soc_camera/mt9m001.c > @@ -603,11 +603,13 @@ static int mt9m001_g_mbus_config(struct v4l2_subdev *sd, > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > /* MT9M001 has all capture_format parameters fixed */ > - cfg->flags = V4L2_MBUS_PCLK_SAMPLE_FALLING | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH | > - V4L2_MBUS_DATA_ACTIVE_HIGH | V4L2_MBUS_MASTER; > + cfg->pb_flags = V4L2_MBUS_PCLK_SAMPLE_FALLING > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH > + | V4L2_MBUS_MASTER; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/mt9t031.c b/drivers/media/i2c/soc_camera/mt9t031.c > index 4802d30e47de..c3c531cd5caa 100644 > --- a/drivers/media/i2c/soc_camera/mt9t031.c > +++ b/drivers/media/i2c/soc_camera/mt9t031.c > @@ -704,11 +704,14 @@ static int mt9t031_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING | > - V4L2_MBUS_PCLK_SAMPLE_FALLING | V4L2_MBUS_HSYNC_ACTIVE_HIGH | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_PCLK_SAMPLE_FALLING > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c > index 297d22ebcb18..4fa761693872 100644 > --- a/drivers/media/i2c/soc_camera/mt9t112.c > +++ b/drivers/media/i2c/soc_camera/mt9t112.c > @@ -1009,11 +1009,14 @@ static int mt9t112_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH | > - V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_PCLK_SAMPLE_FALLING; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c > index 762f06919329..8297dfdad4e9 100644 > --- a/drivers/media/i2c/soc_camera/mt9v022.c > +++ b/drivers/media/i2c/soc_camera/mt9v022.c > @@ -798,13 +798,17 @@ static int mt9v022_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_SLAVE | > - V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_SLAVE > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_PCLK_SAMPLE_FALLING > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_LOW > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_LOW > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c > index 39f420db9c70..629370d8feaa 100644 > --- a/drivers/media/i2c/soc_camera/ov5642.c > +++ b/drivers/media/i2c/soc_camera/ov5642.c > @@ -914,8 +914,9 @@ static int ov5642_g_mbus_config(struct v4l2_subdev *sd, > struct v4l2_mbus_config *cfg) > { > cfg->type = V4L2_MBUS_CSI2; > - cfg->flags = V4L2_MBUS_CSI2_2_LANE | V4L2_MBUS_CSI2_CHANNEL_0 | > - V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > + cfg->csi2_flags = V4L2_MBUS_CSI2_2_LANE > + | V4L2_MBUS_CSI2_CHANNEL_0 > + | V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c > index 806383500313..7e1391460393 100644 > --- a/drivers/media/i2c/soc_camera/ov772x.c > +++ b/drivers/media/i2c/soc_camera/ov772x.c > @@ -1003,11 +1003,13 @@ static int ov772x_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_MASTER > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c > index c63948989688..30ed9c07d42c 100644 > --- a/drivers/media/i2c/soc_camera/ov9640.c > +++ b/drivers/media/i2c/soc_camera/ov9640.c > @@ -634,11 +634,13 @@ static int ov9640_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_MASTER > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c > index 755de2289c39..f3103e7b2924 100644 > --- a/drivers/media/i2c/soc_camera/ov9740.c > +++ b/drivers/media/i2c/soc_camera/ov9740.c > @@ -882,11 +882,13 @@ static int ov9740_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_MASTER > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c b/drivers/media/i2c/soc_camera/rj54n1cb0c.c > index 02398d0bc649..f1d36f6a72b7 100644 > --- a/drivers/media/i2c/soc_camera/rj54n1cb0c.c > +++ b/drivers/media/i2c/soc_camera/rj54n1cb0c.c > @@ -1227,12 +1227,14 @@ static int rj54n1_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = > - V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | > - V4L2_MBUS_MASTER | V4L2_MBUS_DATA_ACTIVE_HIGH | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_PCLK_SAMPLE_FALLING > + | V4L2_MBUS_MASTER > + | V4L2_MBUS_DATA_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c > index bdb5e0a431e9..aa64bea2ef9f 100644 > --- a/drivers/media/i2c/soc_camera/tw9910.c > +++ b/drivers/media/i2c/soc_camera/tw9910.c > @@ -862,12 +862,15 @@ static int tw9910_g_mbus_config(struct v4l2_subdev *sd, > struct i2c_client *client = v4l2_get_subdevdata(sd); > struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); > > - cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | > - V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW | > - V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW | > - V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_MASTER > + | V4L2_MBUS_VSYNC_ACTIVE_HIGH > + | V4L2_MBUS_VSYNC_ACTIVE_LOW > + | V4L2_MBUS_HSYNC_ACTIVE_HIGH > + | V4L2_MBUS_HSYNC_ACTIVE_LOW > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > cfg->type = V4L2_MBUS_PARALLEL; > - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); > + cfg->pb_flags = soc_camera_apply_board_flags(ssdd, cfg); > > return 0; > } > diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c > index 2b8181469b93..668fe1eab93d 100644 > --- a/drivers/media/i2c/tc358743.c > +++ b/drivers/media/i2c/tc358743.c > @@ -1623,20 +1623,20 @@ static int tc358743_g_mbus_config(struct v4l2_subdev *sd, > cfg->type = V4L2_MBUS_CSI2; > > /* Support for non-continuous CSI-2 clock is missing in the driver */ > - cfg->flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > + cfg->csi2_flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; > > switch (state->csi_lanes_in_use) { > case 1: > - cfg->flags |= V4L2_MBUS_CSI2_1_LANE; > + cfg->csi2_flags |= V4L2_MBUS_CSI2_1_LANE; > break; > case 2: > - cfg->flags |= V4L2_MBUS_CSI2_2_LANE; > + cfg->csi2_flags |= V4L2_MBUS_CSI2_2_LANE; > break; > case 3: > - cfg->flags |= V4L2_MBUS_CSI2_3_LANE; > + cfg->csi2_flags |= V4L2_MBUS_CSI2_3_LANE; > break; > case 4: > - cfg->flags |= V4L2_MBUS_CSI2_4_LANE; > + cfg->csi2_flags |= V4L2_MBUS_CSI2_4_LANE; > break; > default: > return -EINVAL; > diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c > index 3c1851984b90..b25ed35de13e 100644 > --- a/drivers/media/i2c/tvp5150.c > +++ b/drivers/media/i2c/tvp5150.c > @@ -976,8 +976,10 @@ static int tvp5150_g_mbus_config(struct v4l2_subdev *sd, > struct tvp5150 *decoder = to_tvp5150(sd); > > cfg->type = decoder->mbus_type; > - cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING > - | V4L2_MBUS_FIELD_EVEN_LOW | V4L2_MBUS_DATA_ACTIVE_HIGH; > + cfg->pb_flags = V4L2_MBUS_MASTER > + | V4L2_MBUS_PCLK_SAMPLE_RISING > + | V4L2_MBUS_FIELD_EVEN_LOW > + | V4L2_MBUS_DATA_ACTIVE_HIGH; > > return 0; > } > diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c > index f028084f0775..2b9d862b883f 100644 > --- a/drivers/media/platform/pxa_camera.c > +++ b/drivers/media/platform/pxa_camera.c > @@ -616,7 +616,7 @@ static unsigned int pxa_mbus_config_compatible(const struct v4l2_mbus_config *cf > bool hsync = true, vsync = true, pclk, data, mode; > bool mipi_lanes, mipi_clock; > > - common_flags = cfg->flags & flags; > + common_flags = cfg->__legacy_flags & flags; > > switch (cfg->type) { > case V4L2_MBUS_PARALLEL: > @@ -1621,7 +1621,7 @@ static int pxa_camera_set_bus_param(struct pxa_camera_dev *pcdev) > if (!common_flags) { > dev_warn(pcdev_to_dev(pcdev), > "Flags incompatible: camera 0x%x, host 0x%lx\n", > - cfg.flags, bus_flags); > + cfg.__legacy_flags, bus_flags); > return -EINVAL; > } > } else if (ret != -ENOIOCTLCMD) { > @@ -1657,7 +1657,7 @@ static int pxa_camera_set_bus_param(struct pxa_camera_dev *pcdev) > common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING; > } > > - cfg.flags = common_flags; > + cfg.__legacy_flags = common_flags; > ret = sensor_call(pcdev, video, s_mbus_config, &cfg); > if (ret < 0 && ret != -ENOIOCTLCMD) { > dev_dbg(pcdev_to_dev(pcdev), > @@ -1688,7 +1688,7 @@ static int pxa_camera_try_bus_param(struct pxa_camera_dev *pcdev, > if (!common_flags) { > dev_warn(pcdev_to_dev(pcdev), > "Flags incompatible: camera 0x%x, host 0x%lx\n", > - cfg.flags, bus_flags); > + cfg.__legacy_flags, bus_flags); > return -EINVAL; > } > } else if (ret == -ENOIOCTLCMD) { > diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c > index f1fc7978d6d1..3803ff31eb44 100644 > --- a/drivers/media/platform/rcar-vin/rcar-core.c > +++ b/drivers/media/platform/rcar-vin/rcar-core.c > @@ -157,11 +157,11 @@ static int rvin_digital_parse_v4l2(struct device *dev, > switch (rvge->mbus_cfg.type) { > case V4L2_MBUS_PARALLEL: > vin_dbg(vin, "Found PARALLEL media bus\n"); > - rvge->mbus_cfg.flags = vep->bus.parallel.flags; > + rvge->mbus_cfg.pb_flags = vep->bus.parallel.flags; > break; > case V4L2_MBUS_BT656: > vin_dbg(vin, "Found BT656 media bus\n"); > - rvge->mbus_cfg.flags = 0; > + rvge->mbus_cfg.pb_flags = 0; > break; > default: > vin_err(vin, "Unknown media bus type\n"); > diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c > index 23fdff7a7370..ed28fef07cd5 100644 > --- a/drivers/media/platform/rcar-vin/rcar-dma.c > +++ b/drivers/media/platform/rcar-vin/rcar-dma.c > @@ -212,11 +212,11 @@ static int rvin_setup(struct rvin_dev *vin) > dmr2 = VNDMR2_FTEV | VNDMR2_VLV(1); > > /* Hsync Signal Polarity Select */ > - if (!(vin->digital->mbus_cfg.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) > + if (!(vin->digital->mbus_cfg.pb_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) > dmr2 |= VNDMR2_HPS; > > /* Vsync Signal Polarity Select */ > - if (!(vin->digital->mbus_cfg.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) > + if (!(vin->digital->mbus_cfg.pb_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) > dmr2 |= VNDMR2_VPS; > > /* > diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c > index 36762ec954e7..7f3c7c152347 100644 > --- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c > +++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c > @@ -744,7 +744,7 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd) > common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW; > } > > - cfg.flags = common_flags; > + cfg.__legacy_flags = common_flags; > ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg); > if (ret < 0 && ret != -ENOIOCTLCMD) > return ret; > diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c > index d13e2c5fb06f..871554a71c2d 100644 > --- a/drivers/media/platform/soc_camera/soc_camera.c > +++ b/drivers/media/platform/soc_camera/soc_camera.c > @@ -217,7 +217,8 @@ EXPORT_SYMBOL(soc_camera_xlate_by_fourcc); > unsigned long soc_camera_apply_board_flags(struct soc_camera_subdev_desc *ssdd, > const struct v4l2_mbus_config *cfg) > { > - unsigned long f, flags = cfg->flags; > + unsigned long f; > + enum v4l2_mbus_parallel_and_bt656_flags flags = cfg->pb_flags; > > /* If only one of the two polarities is supported, switch to the opposite */ > if (ssdd->flags & SOCAM_SENSOR_INVERT_HSYNC) { > diff --git a/drivers/media/platform/soc_camera/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c > index cb4986b8f798..c9230aaef614 100644 > --- a/drivers/media/platform/soc_camera/soc_camera_platform.c > +++ b/drivers/media/platform/soc_camera/soc_camera_platform.c > @@ -104,7 +104,7 @@ static int soc_camera_platform_g_mbus_config(struct v4l2_subdev *sd, > { > struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd); > > - cfg->flags = p->mbus_param; > + cfg->__legacy_flags = p->mbus_param; > cfg->type = p->mbus_type; > > return 0; > diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c > index 0ad4b28266e4..f46cc51940e4 100644 > --- a/drivers/media/platform/soc_camera/soc_mediabus.c > +++ b/drivers/media/platform/soc_camera/soc_mediabus.c > @@ -486,7 +486,7 @@ unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg, > bool hsync = true, vsync = true, pclk, data, mode; > bool mipi_lanes, mipi_clock; > > - common_flags = cfg->flags & flags; > + common_flags = cfg->__legacy_flags & flags; > > switch (cfg->type) { > case V4L2_MBUS_PARALLEL: > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c > index d630640642ee..f9c75a66457a 100644 > --- a/drivers/media/v4l2-core/v4l2-fwnode.c > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c > @@ -44,7 +44,8 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, > { > struct v4l2_fwnode_bus_mipi_csi2 *bus = &vep->bus.mipi_csi2; > bool have_clk_lane = false; > - unsigned int flags = 0, lanes_used = 0; > + unsigned int lanes_used = 0; > + enum v4l2_mbus_csi2_flags flags = 0; > unsigned int i; > u32 v; > int rval; > @@ -112,7 +113,7 @@ static void v4l2_fwnode_endpoint_parse_parallel_bus( > struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep) > { > struct v4l2_fwnode_bus_parallel *bus = &vep->bus.parallel; > - unsigned int flags = 0; > + enum v4l2_mbus_parallel_and_bt656_flags flags = 0; > u32 v; > > if (!fwnode_property_read_u32(fwnode, "hsync-active", &v)) > diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h > index c228ec1c77cf..6ccb971835f8 100644 > --- a/include/media/v4l2-fwnode.h > +++ b/include/media/v4l2-fwnode.h > @@ -32,7 +32,7 @@ struct v4l2_async_subdev; > > /** > * struct v4l2_fwnode_bus_mipi_csi2 - MIPI CSI-2 bus data structure > - * @flags: media bus (V4L2_MBUS_*) flags > + * @flags: media bus CSI flags, as defined by &enum v4l2_mbus_csi2_flags > * @data_lanes: an array of physical data lane indexes > * @clock_lane: physical lane index of the clock lane > * @num_data_lanes: number of data lanes > @@ -40,7 +40,7 @@ struct v4l2_async_subdev; > * the physical lanes. > */ > struct v4l2_fwnode_bus_mipi_csi2 { > - unsigned int flags; > + enum v4l2_mbus_csi2_flags flags; > unsigned char data_lanes[V4L2_FWNODE_CSI2_MAX_DATA_LANES]; > unsigned char clock_lane; > unsigned short num_data_lanes; > diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h > index 4d8626c468bc..560e03db0d9b 100644 > --- a/include/media/v4l2-mediabus.h > +++ b/include/media/v4l2-mediabus.h > @@ -15,51 +15,90 @@ > #include > > > -/* Parallel flags */ > -/* > - * Can the client run in master or in slave mode. By "Master mode" an operation > - * mode is meant, when the client (e.g., a camera sensor) is producing > - * horizontal and vertical synchronisation. In "Slave mode" the host is > - * providing these signals to the slave. > +/** > + * enum v4l2_mbus_flags - Media bus parallel and polarity flags > + * > + * @V4L2_MBUS_MASTER: the client runs on parallel master mode; > + * @V4L2_MBUS_SLAVE: the client runs on parallel slave mode. > + * @V4L2_MBUS_HSYNC_ACTIVE_HIGH: horizontal sync active on high level > + * @V4L2_MBUS_HSYNC_ACTIVE_LOW: horizontal sync active on low level > + * @V4L2_MBUS_VSYNC_ACTIVE_HIGH: vertical sync active on high level > + * @V4L2_MBUS_VSYNC_ACTIVE_LOW: vertical sync active on low level > + * @V4L2_MBUS_PCLK_SAMPLE_RISING: pixel clock sample on level rising > + * @V4L2_MBUS_PCLK_SAMPLE_FALLING: pixel clock sample on level falling > + * @V4L2_MBUS_DATA_ACTIVE_HIGH: data active on high level > + * @V4L2_MBUS_DATA_ACTIVE_LOW: data active on low level > + * @V4L2_MBUS_FIELD_EVEN_HIGH: FIELD = 0/1 - Field1 (odd)/Field2 (even) > + * @V4L2_MBUS_FIELD_EVEN_LOW: FIELD = 1/0 - Field1 (odd)/Field2 (even) > + * @V4L2_MBUS_VIDEO_SOG_ACTIVE_HIGH: Sync-on-green (SoG) signal active > + * on high level > + * @V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW: Sync-on-green (SoG) signal active > + * on low level > + * > + * Those flags are used when the bus is in %V4L2_MBUS_PARALLEL or > + * %V4L2_MBUS_BT656 mode. > + * > + * .. note:: > + * > + * #) @V4L2_MBUS_MASTER and @V4L2_MBUS_SLAVE are only valid if the bus > + * is in %V4L2_MBUS_PARALLEL mode. They are used to specify if the > + * client runs in master or in slave mode. > + * > + * In "Master mode" (@V4L2_MBUS_MASTER), the client (e.g., a camera > + * sensor) is producing horizontal and vertical synchronization. > + * > + * In "Slave mode" (@V4L2_MBUS_SLAVE) the host is providing these signals > + * to the slave. > + * #) in %V4L2_MBUS_BT656 mode, ``V4L2_MBUS_HSYNC_*``, ``V4L2_MBUS_VSYNC_*`` > + * and ``V4L2_MBUS_FIELD_*`` flags are unused. > + * #) ``V4L2_MBUS_[HV]SYNC*`` flags should be also used for specifying > + * configuration of hardware that uses [HV]REF signals > */ > -#define V4L2_MBUS_MASTER BIT(0) > -#define V4L2_MBUS_SLAVE BIT(1) > -/* > - * Signal polarity flags > - * Note: in BT.656 mode HSYNC, FIELD, and VSYNC are unused > - * V4L2_MBUS_[HV]SYNC* flags should be also used for specifying > - * configuration of hardware that uses [HV]REF signals > - */ > -#define V4L2_MBUS_HSYNC_ACTIVE_HIGH BIT(2) > -#define V4L2_MBUS_HSYNC_ACTIVE_LOW BIT(3) > -#define V4L2_MBUS_VSYNC_ACTIVE_HIGH BIT(4) > -#define V4L2_MBUS_VSYNC_ACTIVE_LOW BIT(5) > -#define V4L2_MBUS_PCLK_SAMPLE_RISING BIT(6) > -#define V4L2_MBUS_PCLK_SAMPLE_FALLING BIT(7) > -#define V4L2_MBUS_DATA_ACTIVE_HIGH BIT(8) > -#define V4L2_MBUS_DATA_ACTIVE_LOW BIT(9) > -/* FIELD = 0/1 - Field1 (odd)/Field2 (even) */ > -#define V4L2_MBUS_FIELD_EVEN_HIGH BIT(10) > -/* FIELD = 1/0 - Field1 (odd)/Field2 (even) */ > -#define V4L2_MBUS_FIELD_EVEN_LOW BIT(11) > -/* Active state of Sync-on-green (SoG) signal, 0/1 for LOW/HIGH respectively. */ > -#define V4L2_MBUS_VIDEO_SOG_ACTIVE_HIGH BIT(12) > -#define V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW BIT(13) > +enum v4l2_mbus_parallel_and_bt656_flags { > + V4L2_MBUS_MASTER = BIT(0), > + V4L2_MBUS_SLAVE = BIT(1), > + V4L2_MBUS_HSYNC_ACTIVE_HIGH = BIT(2), > + V4L2_MBUS_HSYNC_ACTIVE_LOW = BIT(3), > + V4L2_MBUS_VSYNC_ACTIVE_HIGH = BIT(4), > + V4L2_MBUS_VSYNC_ACTIVE_LOW = BIT(5), > + V4L2_MBUS_PCLK_SAMPLE_RISING = BIT(6), > + V4L2_MBUS_PCLK_SAMPLE_FALLING = BIT(7), > + V4L2_MBUS_DATA_ACTIVE_HIGH = BIT(8), > + V4L2_MBUS_DATA_ACTIVE_LOW = BIT(9), > + V4L2_MBUS_FIELD_EVEN_HIGH = BIT(10), > + V4L2_MBUS_FIELD_EVEN_LOW = BIT(11), > + V4L2_MBUS_VIDEO_SOG_ACTIVE_HIGH = BIT(12), > + V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW = BIT(13), > +}; > > -/* Serial flags */ > -/* How many lanes the client can use */ > -#define V4L2_MBUS_CSI2_1_LANE BIT(0) > -#define V4L2_MBUS_CSI2_2_LANE BIT(1) > -#define V4L2_MBUS_CSI2_3_LANE BIT(2) > -#define V4L2_MBUS_CSI2_4_LANE BIT(3) > -/* On which channels it can send video data */ > -#define V4L2_MBUS_CSI2_CHANNEL_0 BIT(4) > -#define V4L2_MBUS_CSI2_CHANNEL_1 BIT(5) > -#define V4L2_MBUS_CSI2_CHANNEL_2 BIT(6) > -#define V4L2_MBUS_CSI2_CHANNEL_3 BIT(7) > -/* Does it support only continuous or also non-continuous clock mode */ > -#define V4L2_MBUS_CSI2_CONTINUOUS_CLOCK BIT(8) > -#define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK BIT(9) > +/** > + * enum v4l2_mbus_csi2_flags - Media bus serial flags > + * > + * @V4L2_MBUS_CSI2_1_LANE: One lane in use > + * @V4L2_MBUS_CSI2_2_LANE: Two lanes in use > + * @V4L2_MBUS_CSI2_3_LANE: Three lanes in use > + * @V4L2_MBUS_CSI2_4_LANE: Four lanes in use > + * @V4L2_MBUS_CSI2_CHANNEL_0: Channel 0 can send video data > + * @V4L2_MBUS_CSI2_CHANNEL_1: Channel 1 can send video data > + * @V4L2_MBUS_CSI2_CHANNEL_2: Channel 2 can send video data > + * @V4L2_MBUS_CSI2_CHANNEL_3: Channel 3 can send video data > + * @V4L2_MBUS_CSI2_CONTINUOUS_CLOCK: Supports continuous clock mode > + * @V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK: Supports non-continuous clock mode > + * > + * Used only when the bus type is MIPI CSI-2. > + */ > +enum v4l2_mbus_csi2_flags { > + V4L2_MBUS_CSI2_1_LANE = BIT(0), > + V4L2_MBUS_CSI2_2_LANE = BIT(1), > + V4L2_MBUS_CSI2_3_LANE = BIT(2), > + V4L2_MBUS_CSI2_4_LANE = BIT(3), > + V4L2_MBUS_CSI2_CHANNEL_0 = BIT(4), > + V4L2_MBUS_CSI2_CHANNEL_1 = BIT(5), > + V4L2_MBUS_CSI2_CHANNEL_2 = BIT(6), > + V4L2_MBUS_CSI2_CHANNEL_3 = BIT(7), > + V4L2_MBUS_CSI2_CONTINUOUS_CLOCK = BIT(8), > + V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK = BIT(9), > +}; > > #define V4L2_MBUS_CSI2_LANES (V4L2_MBUS_CSI2_1_LANE | V4L2_MBUS_CSI2_2_LANE | \ > V4L2_MBUS_CSI2_3_LANE | V4L2_MBUS_CSI2_4_LANE) > @@ -69,8 +108,8 @@ > /** > * enum v4l2_mbus_type - media bus type > * @V4L2_MBUS_PARALLEL: parallel interface with hsync and vsync > - * @V4L2_MBUS_BT656: parallel interface with embedded synchronisation, can > - * also be used for BT.1120 > + * @V4L2_MBUS_BT656: parallel interface with embedded synchronization using ITU-R BT.656 > + * signaling. Can also be used for ISO-R BT.1120 signaling. > * @V4L2_MBUS_CSI1: MIPI CSI-1 serial interface > * @V4L2_MBUS_CCP2: CCP2 (Compact Camera Port 2) > * @V4L2_MBUS_CSI2: MIPI CSI-2 serial interface > @@ -86,11 +125,23 @@ enum v4l2_mbus_type { > /** > * struct v4l2_mbus_config - media bus configuration > * @type: in: interface type > - * @flags: in / out: configuration flags, depending on @type > + * @pb_flags: in / out: configuration flags, if @type is > + * %V4L2_MBUS_PARALLEL or %V4L2_MBUS_BT656. > + * @csi2_flags: in / out: configuration flags, if @type is > + * %V4L2_MBUS_CSI2. > + * @__legacy_flags: > + * access flags, no matter the @type. > + * Used just to avoid needing to rewrite the logic inside > + * soc_camera and pxa_camera drivers. Don't use on newer > + * drivers! > */ > struct v4l2_mbus_config { > enum v4l2_mbus_type type; > - unsigned int flags; > + union { > + enum v4l2_mbus_parallel_and_bt656_flags pb_flags; > + enum v4l2_mbus_csi2_flags csi2_flags; > + unsigned int __legacy_flags; > + }; > }; > > /** diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index eb7be5093a9d5..b1daac3a537d9 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -636,9 +636,10 @@ static int csi_setup(struct csi_priv *priv)     /* compose mbus_config from the upstream endpoint */   mbus_cfg.type = priv->upstream_ep.bus_type; - mbus_cfg.flags = (priv->upstream_ep.bus_type == V4L2_MBUS_CSI2) ? - priv->upstream_ep.bus.mipi_csi2.flags : - priv->upstream_ep.bus.parallel.flags; + if (priv->upstream_ep.bus_type == V4L2_MBUS_CSI2) + mbus_cfg.csi2_flags = priv->upstream_ep.bus.mipi_csi2.flags; + else + mbus_cfg.pb_flags = priv->upstream_ep.bus.parallel.flags;   /*  * we need to pass input frame to CSI interface, but