From: Michael Tretter <m.tretter@pengutronix.de> To: linux-media@vger.kernel.org, devicetree@vger.kernel.org, Philipp Zabel <p.zabel@pengutronix.de>, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Michael Tretter <m.tretter@pengutronix.de>, Mauro Carvalho Chehab <mchehab@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Fabio Estevam <festevam@gmail.com>, Alexander Stein <alexander.stein@ew.tq-group.com>, kernel@pengutronix.de, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 03/16] media: imx-pxp: extract helper function to setup data path Date: Fri, 13 Jan 2023 10:54:09 +0100 [thread overview] Message-ID: <20230112-imx-pxp-v2-3-e2281da1db55@pengutronix.de> (raw) In-Reply-To: <20230112-imx-pxp-v2-0-e2281da1db55@pengutronix.de> The driver must configure the data path through the Pixel Pipeline. Currently, the driver is using a fixed setup, but once there are different pipeline configurations, it is helpful to have a dedicated function for determining the register value for the data path. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> --- Changelog: v2: none --- drivers/media/platform/nxp/imx-pxp.c | 62 ++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c index 5b671c6e5cae..675fd00faaac 100644 --- a/drivers/media/platform/nxp/imx-pxp.c +++ b/drivers/media/platform/nxp/imx-pxp.c @@ -724,6 +724,47 @@ static void pxp_setup_csc(struct pxp_ctx *ctx) } } +static u32 pxp_data_path_ctrl0(struct pxp_ctx *ctx) +{ + u32 ctrl0; + + ctrl0 = 0; + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX15_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX14_SEL(1); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX13_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX12_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX11_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX10_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX9_SEL(1); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX8_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX7_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX6_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX5_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX4_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX3_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX2_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX1_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX0_SEL(0); + + return ctrl0; +} + +static void pxp_set_data_path(struct pxp_ctx *ctx) +{ + struct pxp_dev *dev = ctx->dev; + u32 ctrl0; + u32 ctrl1; + + ctrl0 = pxp_data_path_ctrl0(ctx); + + ctrl1 = 0; + ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(1); + ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(1); + + writel(ctrl0, dev->mmio + HW_PXP_DATA_PATH_CTRL0); + writel(ctrl1, dev->mmio + HW_PXP_DATA_PATH_CTRL1); +} + static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb, struct vb2_v4l2_buffer *out_vb) { @@ -910,26 +951,7 @@ static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb, /* bypass LUT */ writel(BM_PXP_LUT_CTRL_BYPASS, dev->mmio + HW_PXP_LUT_CTRL); - writel(BF_PXP_DATA_PATH_CTRL0_MUX15_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX14_SEL(1)| - BF_PXP_DATA_PATH_CTRL0_MUX13_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX12_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX11_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX10_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX9_SEL(1)| - BF_PXP_DATA_PATH_CTRL0_MUX8_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX7_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX6_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX5_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX4_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX3_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX2_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX1_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX0_SEL(0), - dev->mmio + HW_PXP_DATA_PATH_CTRL0); - writel(BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(1) | - BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(1), - dev->mmio + HW_PXP_DATA_PATH_CTRL1); + pxp_set_data_path(ctx); writel(0xffff, dev->mmio + HW_PXP_IRQ_MASK); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Michael Tretter <m.tretter@pengutronix.de> To: linux-media@vger.kernel.org, devicetree@vger.kernel.org, Philipp Zabel <p.zabel@pengutronix.de>, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Michael Tretter <m.tretter@pengutronix.de>, Mauro Carvalho Chehab <mchehab@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Fabio Estevam <festevam@gmail.com>, Alexander Stein <alexander.stein@ew.tq-group.com>, kernel@pengutronix.de, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 03/16] media: imx-pxp: extract helper function to setup data path Date: Fri, 13 Jan 2023 10:54:09 +0100 [thread overview] Message-ID: <20230112-imx-pxp-v2-3-e2281da1db55@pengutronix.de> (raw) In-Reply-To: <20230112-imx-pxp-v2-0-e2281da1db55@pengutronix.de> The driver must configure the data path through the Pixel Pipeline. Currently, the driver is using a fixed setup, but once there are different pipeline configurations, it is helpful to have a dedicated function for determining the register value for the data path. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> --- Changelog: v2: none --- drivers/media/platform/nxp/imx-pxp.c | 62 ++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c index 5b671c6e5cae..675fd00faaac 100644 --- a/drivers/media/platform/nxp/imx-pxp.c +++ b/drivers/media/platform/nxp/imx-pxp.c @@ -724,6 +724,47 @@ static void pxp_setup_csc(struct pxp_ctx *ctx) } } +static u32 pxp_data_path_ctrl0(struct pxp_ctx *ctx) +{ + u32 ctrl0; + + ctrl0 = 0; + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX15_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX14_SEL(1); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX13_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX12_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX11_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX10_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX9_SEL(1); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX8_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX7_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX6_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX5_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX4_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX3_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX2_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX1_SEL(0); + ctrl0 |= BF_PXP_DATA_PATH_CTRL0_MUX0_SEL(0); + + return ctrl0; +} + +static void pxp_set_data_path(struct pxp_ctx *ctx) +{ + struct pxp_dev *dev = ctx->dev; + u32 ctrl0; + u32 ctrl1; + + ctrl0 = pxp_data_path_ctrl0(ctx); + + ctrl1 = 0; + ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(1); + ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(1); + + writel(ctrl0, dev->mmio + HW_PXP_DATA_PATH_CTRL0); + writel(ctrl1, dev->mmio + HW_PXP_DATA_PATH_CTRL1); +} + static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb, struct vb2_v4l2_buffer *out_vb) { @@ -910,26 +951,7 @@ static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb, /* bypass LUT */ writel(BM_PXP_LUT_CTRL_BYPASS, dev->mmio + HW_PXP_LUT_CTRL); - writel(BF_PXP_DATA_PATH_CTRL0_MUX15_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX14_SEL(1)| - BF_PXP_DATA_PATH_CTRL0_MUX13_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX12_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX11_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX10_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX9_SEL(1)| - BF_PXP_DATA_PATH_CTRL0_MUX8_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX7_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX6_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX5_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX4_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX3_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX2_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX1_SEL(0)| - BF_PXP_DATA_PATH_CTRL0_MUX0_SEL(0), - dev->mmio + HW_PXP_DATA_PATH_CTRL0); - writel(BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(1) | - BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(1), - dev->mmio + HW_PXP_DATA_PATH_CTRL1); + pxp_set_data_path(ctx); writel(0xffff, dev->mmio + HW_PXP_IRQ_MASK); -- 2.30.2
next prev parent reply other threads:[~2023-01-13 9:56 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-13 9:54 [PATCH v2 00/16] media: imx-pxp: add support for i.MX7D Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 9:54 ` [PATCH v2 01/16] dt-bindings: media: fsl-pxp: convert to yaml Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 10:41 ` Laurent Pinchart 2023-01-13 10:41 ` Laurent Pinchart 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:56 ` Krzysztof Kozlowski 2023-01-13 11:56 ` Krzysztof Kozlowski 2023-01-13 15:09 ` Michael Tretter 2023-01-13 15:09 ` Michael Tretter 2023-01-13 16:51 ` Krzysztof Kozlowski 2023-01-13 16:51 ` Krzysztof Kozlowski 2023-01-13 15:26 ` Rob Herring 2023-01-13 15:26 ` Rob Herring 2023-01-16 11:38 ` [PATCH v2.1 02/17] " Michael Tretter 2023-01-16 11:38 ` Michael Tretter 2023-01-16 11:59 ` Krzysztof Kozlowski 2023-01-16 11:59 ` Krzysztof Kozlowski 2023-01-16 16:11 ` Laurent Pinchart 2023-01-16 16:11 ` Laurent Pinchart 2023-01-13 9:54 ` [PATCH v2 02/16] media: imx-pxp: detect PXP version Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 10:44 ` Laurent Pinchart 2023-01-13 10:44 ` Laurent Pinchart 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` Michael Tretter [this message] 2023-01-13 9:54 ` [PATCH v2 03/16] media: imx-pxp: extract helper function to setup data path Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 04/16] media: imx-pxp: explicitly disable unused blocks Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 05/16] media: imx-pxp: disable LUT block Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 06/16] media: imx-pxp: make data_path_ctrl0 platform dependent Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 12:03 ` Laurent Pinchart 2023-01-13 12:03 ` Laurent Pinchart 2023-01-13 9:54 ` [PATCH v2 07/16] media: imx-pxp: add support for i.MX7D Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 08/16] ARM: dts: imx7d: add node for PXP Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-16 16:26 ` Laurent Pinchart 2023-01-16 16:26 ` Laurent Pinchart 2023-01-20 9:06 ` Michael Tretter 2023-01-20 9:06 ` Michael Tretter 2023-01-20 9:20 ` Laurent Pinchart 2023-01-20 9:20 ` Laurent Pinchart 2023-02-09 14:02 ` Michael Tretter 2023-02-09 14:02 ` Michael Tretter 2023-03-06 1:19 ` Shawn Guo 2023-03-06 1:19 ` Shawn Guo 2023-01-13 9:54 ` [PATCH v2 09/16] media: imx-pxp: Sort headers alphabetically Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 10/16] media: imx-pxp: Don't set bus_info manually in .querycap() Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 11/16] media: imx-pxp: Add media controller support Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 12/16] media: imx-pxp: Pass pixel format value to find_format() Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 11:46 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 13/16] media: imx-pxp: Implement frame size enumeration Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:49 ` Philipp Zabel 2023-01-13 11:49 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 14/16] media: imx-pxp: Introduce pxp_read() and pxp_write() wrappers Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:50 ` Philipp Zabel 2023-01-13 11:50 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 15/16] media: imx-pxp: Use non-threaded IRQ Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:52 ` Philipp Zabel 2023-01-13 11:52 ` Philipp Zabel 2023-01-13 9:54 ` [PATCH v2 16/16] media: imx-pxp: convert to regmap Michael Tretter 2023-01-13 9:54 ` Michael Tretter 2023-01-13 11:56 ` Philipp Zabel 2023-01-13 11:56 ` Philipp Zabel 2023-01-14 21:29 ` [PATCH v2 00/16] media: imx-pxp: add support for i.MX7D Laurent Pinchart 2023-01-14 21:29 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230112-imx-pxp-v2-3-e2281da1db55@pengutronix.de \ --to=m.tretter@pengutronix.de \ --cc=alexander.stein@ew.tq-group.com \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-media@vger.kernel.org \ --cc=mchehab@kernel.org \ --cc=p.zabel@pengutronix.de \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.