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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1864C5479D for ; Fri, 6 Jan 2023 12:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230048AbjAFMbT (ORCPT ); Fri, 6 Jan 2023 07:31:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231858AbjAFMbB (ORCPT ); Fri, 6 Jan 2023 07:31:01 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CC123D5D3; Fri, 6 Jan 2023 04:30:59 -0800 (PST) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 530C64AE; Fri, 6 Jan 2023 13:30:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1673008257; bh=+YtF8mprGIFPaAWu0u6IBFSg5EXh3kE+K3R+8cVQZ18=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vaf3U6U7t2iwZ6s/HoJaQUX+iM+7weUE9imeuQ7EGpV8jO+/NPoEW7639X9PYoytK Ky+delfHTbfrWUzVK9BOzb+WfEUNKSvdnZUk1eV73csM3YhIKOh+bqm8PGgVZpkgqq d/jVPZQpc8WMd/66i+MvwTulFDNmOE3V9VteVBOo= Date: Fri, 6 Jan 2023 14:30:52 +0200 From: Laurent Pinchart To: Michael Tretter Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, Philipp Zabel , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Fabio Estevam , kernel@pengutronix.de, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 6/8] media: imx-pxp: make data_path_ctrl0 platform dependent Message-ID: References: <20230105134729.59542-1-m.tretter@pengutronix.de> <20230105134729.59542-7-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230105134729.59542-7-m.tretter@pengutronix.de> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Michael, Thank you for the patch. On Thu, Jan 05, 2023 at 02:47:27PM +0100, Michael Tretter wrote: > Unfortunately, the PXP_HW_VERSION register reports the PXP on the i.MX7D > and on the i.MX6ULL as version 3.0, although the PXP versions on these > SoCs have significant differences. > > Use the compatible to configure the ctrl0 register as required dependent > on the platform. > > Signed-off-by: Michael Tretter > --- > drivers/media/platform/nxp/imx-pxp.c | 27 +++++++++++++++++++++++++-- > 1 file changed, 25 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c > index 1d649b9cadad..4e182f80a36b 100644 > --- a/drivers/media/platform/nxp/imx-pxp.c > +++ b/drivers/media/platform/nxp/imx-pxp.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -191,6 +192,11 @@ static struct pxp_fmt *find_format(struct v4l2_format *f) > return &formats[k]; > } > > +struct pxp_ctx; Please add a blank line here. > +struct pxp_pdata { > + u32 (*data_path_ctrl0)(struct pxp_ctx *ctx); > +}; > + > struct pxp_dev { > struct v4l2_device v4l2_dev; > struct video_device vfd; > @@ -199,6 +205,7 @@ struct pxp_dev { > void __iomem *mmio; > > u32 hw_version; > + const struct pxp_pdata *pdata; > > atomic_t num_inst; > struct mutex dev_mutex; > @@ -726,7 +733,7 @@ static void pxp_setup_csc(struct pxp_ctx *ctx) > } > } > > -static u32 pxp_data_path_ctrl0(struct pxp_ctx *ctx) > +static u32 pxp_imx6ull_data_path_ctrl0(struct pxp_ctx *ctx) > { > u32 ctrl0; > > @@ -756,6 +763,16 @@ static u32 pxp_data_path_ctrl0(struct pxp_ctx *ctx) > return ctrl0; > } > > +static u32 pxp_data_path_ctrl0(struct pxp_ctx *ctx) > +{ > + struct pxp_dev *dev = ctx->dev; > + > + if (dev->pdata && dev->pdata->data_path_ctrl0) > + return dev->pdata->data_path_ctrl0(ctx); > + > + return pxp_imx6ull_data_path_ctrl0(ctx); Do you need this fallback, given that all compatible strings give you valid pdata ? I'd rather be explicit. This function then becomes so small that I would inline it in the caller. > +} > + > static void pxp_set_data_path(struct pxp_ctx *ctx) > { > struct pxp_dev *dev = ctx->dev; > @@ -1711,6 +1728,8 @@ static int pxp_probe(struct platform_device *pdev) > if (!dev) > return -ENOMEM; > > + dev->pdata = of_device_get_match_data(&pdev->dev); > + > dev->clk = devm_clk_get(&pdev->dev, "axi"); > if (IS_ERR(dev->clk)) { > ret = PTR_ERR(dev->clk); > @@ -1811,8 +1830,12 @@ static int pxp_remove(struct platform_device *pdev) > return 0; > } > > +static const struct pxp_pdata pxp_imx6ull_pdata = { > + .data_path_ctrl0 = pxp_imx6ull_data_path_ctrl0, > +}; > + > static const struct of_device_id pxp_dt_ids[] = { > - { .compatible = "fsl,imx6ull-pxp", .data = NULL }, > + { .compatible = "fsl,imx6ull-pxp", .data = &pxp_imx6ull_pdata }, > { }, > }; > MODULE_DEVICE_TABLE(of, pxp_dt_ids); -- Regards, Laurent Pinchart