| Message ID | 20230112-imx-pxp-v2-6-e2281da1db55@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx-pxp: add support for i.MX7D | expand |
On Fr, 2023-01-13 at 10:54 +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 <m.tretter@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
Hi Michael, Thank you for the patch. On Fri, Jan 13, 2023 at 10:54:12AM +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 <m.tretter@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changelog > > v2: > > - drop fallback for missing data_path_ctrl0 > --- > drivers/media/platform/nxp/imx-pxp.c | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c > index bf3be989a552..c7f8a1808516 100644 > --- a/drivers/media/platform/nxp/imx-pxp.c > +++ b/drivers/media/platform/nxp/imx-pxp.c > @@ -19,6 +19,7 @@ > #include <linux/iopoll.h> > #include <linux/module.h> > #include <linux/of.h> > +#include <linux/of_device.h> > #include <linux/sched.h> > #include <linux/slab.h> > > @@ -191,6 +192,12 @@ static struct pxp_fmt *find_format(struct v4l2_format *f) > return &formats[k]; > } > > +struct pxp_ctx; > + > +struct pxp_pdata { > + u32 (*data_path_ctrl0)(struct pxp_ctx *ctx); > +}; > + > struct pxp_dev { > struct v4l2_device v4l2_dev; > struct video_device vfd; > @@ -198,6 +205,8 @@ struct pxp_dev { > struct clk *clk; > void __iomem *mmio; > > + const struct pxp_pdata *pdata; > + > atomic_t num_inst; > struct mutex dev_mutex; > spinlock_t irqlock; > @@ -724,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; > > @@ -760,7 +769,7 @@ static void pxp_set_data_path(struct pxp_ctx *ctx) > u32 ctrl0; > u32 ctrl1; > > - ctrl0 = pxp_data_path_ctrl0(ctx); > + ctrl0 = dev->pdata->data_path_ctrl0(ctx); > > ctrl1 = 0; > ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(3); > @@ -1705,6 +1714,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); > @@ -1804,8 +1815,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);
diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c index bf3be989a552..c7f8a1808516 100644 --- a/drivers/media/platform/nxp/imx-pxp.c +++ b/drivers/media/platform/nxp/imx-pxp.c @@ -19,6 +19,7 @@ #include <linux/iopoll.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/sched.h> #include <linux/slab.h> @@ -191,6 +192,12 @@ static struct pxp_fmt *find_format(struct v4l2_format *f) return &formats[k]; } +struct pxp_ctx; + +struct pxp_pdata { + u32 (*data_path_ctrl0)(struct pxp_ctx *ctx); +}; + struct pxp_dev { struct v4l2_device v4l2_dev; struct video_device vfd; @@ -198,6 +205,8 @@ struct pxp_dev { struct clk *clk; void __iomem *mmio; + const struct pxp_pdata *pdata; + atomic_t num_inst; struct mutex dev_mutex; spinlock_t irqlock; @@ -724,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; @@ -760,7 +769,7 @@ static void pxp_set_data_path(struct pxp_ctx *ctx) u32 ctrl0; u32 ctrl1; - ctrl0 = pxp_data_path_ctrl0(ctx); + ctrl0 = dev->pdata->data_path_ctrl0(ctx); ctrl1 = 0; ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(3); @@ -1705,6 +1714,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); @@ -1804,8 +1815,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);
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 <m.tretter@pengutronix.de> --- Changelog v2: - drop fallback for missing data_path_ctrl0 --- drivers/media/platform/nxp/imx-pxp.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)