From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC5D6CCF9E5 for ; Mon, 27 Oct 2025 01:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KpTLXq4Bl+s2v44deT895JNM/3sC92D6LsAgAux2acA=; b=Hln7IvSHD551JPhLW3QQeXxRjz 6jyCWW8Um1enwAt67Pu1MoyQJjBHob4asFGVC7qFZcohK3Evx8dtfBRmcT8QWAobUy8T9Auz17tP9 HXCGvChettqeNJKjM3HwwKnrURxraGTn6ZCvB3akvnA2AtElxiooIfcdi+IG5llXy1ov+dy1679t3 j1ya21bLcGEKqC+L79rjFd7SCkXBuZEWZHkGXwUMXjqtEP+TP3QRPBAKWp+ij5+3/0d6AZXt9Lqx1 0G6CMNXtyqP6RnYsgboB1CrwbhCoxt+JsK//JtK1qEkCWxxAK+UfzvKnHSdvlF536U2Z3VWoAXnBA 5ZWVYJ8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vDCIG-0000000Cy73-1V0c; Mon, 27 Oct 2025 01:45:08 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vDCIB-0000000Cy6G-3fQ2; Mon, 27 Oct 2025 01:45:07 +0000 Received: from pendragon.ideasonboard.com (82-203-161-16.bb.dnainternet.fi [82.203.161.16]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id A6FF01661; Mon, 27 Oct 2025 02:43:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1761529394; bh=Hk/Cv0JH4I2/bc25Mtk3P330bEAkbyQwBrU4iJ+LcR0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DmTIN/959mBfIT+SM6ajcFq7f1gtKFOU1XBpuVR9S5nMNJAfTME+ec9eVlp/IrWpZ jnhQpBCdBl3dBL2OQsmBcFjLIrAAgHT11G0ROsI9kpfcxBJ+5LGmQv5Ksyhy9cRwGw ldoeuI7N0ZfgwF0zLYsD1QT3Cmqwr3+/+ocVbQlc= Date: Mon, 27 Oct 2025 03:44:48 +0200 From: Laurent Pinchart To: Frank Li Cc: Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Eugen Hristev , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Peng Fan , Alice Yuan , Vinod Koul , Kishon Vijay Abraham I , Philipp Zabel , Steve Longerbeam , Greg Kroah-Hartman , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, linux-staging@lists.linux.dev Subject: Re: [PATCH v3 12/31] media: staging: media: imx6-mipi-csi2: move sd imx6's specific initialization into imx6-sci2.c Message-ID: <20251027014448.GV13023@pendragon.ideasonboard.com> References: <20250821-95_cam-v3-0-c9286fbb34b9@nxp.com> <20250821-95_cam-v3-12-c9286fbb34b9@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250821-95_cam-v3-12-c9286fbb34b9@nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251026_184504_052104_09EFBA69 X-CRM114-Status: GOOD ( 22.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Aug 21, 2025 at 04:15:47PM -0400, Frank Li wrote: > Move imx6's specific sd's owner, name, csi2_internal_ops, grp_id into grp_id needs to go. It's specific to the i.MX6 IPUv3 framework, and is the main part hindering splitting the CSI-2 receiver driver from the rest of the code. > imx6-sci2.c. > > Signed-off-by: Frank Li > --- > drivers/staging/media/imx/imx6-csi2.c | 23 +++++++++++++++++++++++ > drivers/staging/media/imx/imx6-mipi-csi2.c | 29 ++++++----------------------- > include/media/dw-mipi-csi2.h | 4 ++++ > 3 files changed, 33 insertions(+), 23 deletions(-) > > diff --git a/drivers/staging/media/imx/imx6-csi2.c b/drivers/staging/media/imx/imx6-csi2.c > index 72eff685fad99b3def46cf2866565191b7de9a8b..66274d8d73b67b35682bb82a9eb745bb24da7ae4 100644 > --- a/drivers/staging/media/imx/imx6-csi2.c > +++ b/drivers/staging/media/imx/imx6-csi2.c > @@ -19,6 +19,29 @@ struct imx6_csi2 { > struct dw_mipi_csi2_dev dw; > }; > > +static int csi2_registered(struct v4l2_subdev *sd) > +{ > + struct dw_mipi_csi2_dev *csi2 = sd_to_dw_mipi_csi2_dev(sd); > + > + /* set a default mbus format */ > + return imx_media_init_mbus_fmt(&csi2->format_mbus, > + IMX_MEDIA_DEF_PIX_WIDTH, > + IMX_MEDIA_DEF_PIX_HEIGHT, 0, > + V4L2_FIELD_NONE, NULL); > +} > + > +static const struct v4l2_subdev_internal_ops csi2_internal_ops = { > + .init_state = imx_media_init_state, > + .registered = csi2_registered, > +}; > + > +static const struct dw_mipi_csi2_config imx6_config = { > + .module = THIS_MODULE, > + .name = "imx6-mipi-csi2", > + .internal_ops = &csi2_internal_ops, > + .grp_id = IMX_MEDIA_GRP_ID_CSI2, > +}; > + > static int csi2_probe(struct platform_device *pdev) > { > struct imx6_csi2 *csi2; > diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c > index b5911a37972be868e10c115ada1910fa04b2765c..ff06a739b957b305625d145c04c06999d0c13cae 100644 > --- a/drivers/staging/media/imx/imx6-mipi-csi2.c > +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c > @@ -15,11 +15,11 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > -#include "imx-media.h" > > /* > * The default maximum bit-rate per lane in Mbps, if the > @@ -44,8 +44,6 @@ struct dw_csi2_regs { > u32 phy_tst_ctrl1; > }; > > -#define DEVICE_NAME "imx6-mipi-csi2" > - > /* Help check wrong access unexisted register at difference IP version */ > #define DW_REG_EXIST 0x80000000 > #define DW_REG(x) (DW_REG_EXIST | (x)) > @@ -544,17 +542,6 @@ static int csi2_set_fmt(struct v4l2_subdev *sd, > return 0; > } > > -static int csi2_registered(struct v4l2_subdev *sd) > -{ > - struct dw_mipi_csi2_dev *csi2 = sd_to_dev(sd); > - > - /* set a default mbus format */ > - return imx_media_init_mbus_fmt(&csi2->format_mbus, > - IMX_MEDIA_DEF_PIX_WIDTH, > - IMX_MEDIA_DEF_PIX_HEIGHT, 0, > - V4L2_FIELD_NONE, NULL); > -} > - > /* --------------- CORE OPS --------------- */ > > static int csi2_log_status(struct v4l2_subdev *sd) > @@ -605,11 +592,6 @@ static const struct v4l2_subdev_ops csi2_subdev_ops = { > .pad = &csi2_pad_ops, > }; > > -static const struct v4l2_subdev_internal_ops csi2_internal_ops = { > - .init_state = imx_media_init_state, > - .registered = csi2_registered, > -}; > - > static int csi2_notify_bound(struct v4l2_async_notifier *notifier, > struct v4l2_subdev *sd, > struct v4l2_async_connection *asd) > @@ -709,14 +691,15 @@ int dw_mipi_csi2_init(struct platform_device *pdev, struct dw_mipi_csi2_dev *csi > csi2->regs = &dw_csi2_v0; > v4l2_subdev_init(&csi2->sd, &csi2_subdev_ops); > v4l2_set_subdevdata(&csi2->sd, &pdev->dev); > - csi2->sd.internal_ops = &csi2_internal_ops; > csi2->sd.entity.ops = &csi2_entity_ops; > csi2->sd.dev = &pdev->dev; > - csi2->sd.owner = THIS_MODULE; > csi2->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE; > - strscpy(csi2->sd.name, DEVICE_NAME, sizeof(csi2->sd.name)); > csi2->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE; > - csi2->sd.grp_id = IMX_MEDIA_GRP_ID_CSI2; > + > + csi2->sd.owner = config->module; > + strscpy(csi2->sd.name, config->name, sizeof(csi2->sd.name)); > + csi2->sd.internal_ops = config->internal_ops; > + csi2->sd.grp_id = config->grp_id; > > for (i = 0; i < CSI2_NUM_PADS; i++) { > csi2->pad[i].flags = (i == CSI2_SINK_PAD) ? > diff --git a/include/media/dw-mipi-csi2.h b/include/media/dw-mipi-csi2.h > index 4e656f09c81db9dc9f232ed061f70803a5478c85..dfd25e23ea93fd53b064471b6a9557ef9c070fe7 100644 > --- a/include/media/dw-mipi-csi2.h > +++ b/include/media/dw-mipi-csi2.h > @@ -10,6 +10,10 @@ > #include > > struct dw_mipi_csi2_config { > + struct module *module; > + const char *name; > + int grp_id; > + const struct v4l2_subdev_internal_ops *internal_ops; > }; > > /* -- Regards, Laurent Pinchart