| Message ID | 20230112-imx-pxp-v2-2-e2281da1db55@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx-pxp: add support for i.MX7D | expand |
Hi Michael, Thank you for the patch. On Fri, Jan 13, 2023 at 10:54:08AM +0100, Michael Tretter wrote: > Different versions of the Pixel Pipeline have different blocks and their > routing may be different. Read the PXP_HW_VERSION register to determine > the version of the PXP and print it to the log for debugging purposes. > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> > --- > Changelog: > > v2: > > - reduce debug level for version to dev_dbg > - drop hw_version field from struct pxp_dev > --- > drivers/media/platform/nxp/imx-pxp.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c > index 689ae5e6ac62..5b671c6e5cae 100644 > --- a/drivers/media/platform/nxp/imx-pxp.c > +++ b/drivers/media/platform/nxp/imx-pxp.c > @@ -10,6 +10,7 @@ > * Pawel Osciak, <pawel@osciak.com> > * Marek Szyprowski, <m.szyprowski@samsung.com> > */ > +#include <linux/bitfield.h> > #include <linux/clk.h> > #include <linux/delay.h> > #include <linux/dma-mapping.h> > @@ -52,6 +53,11 @@ MODULE_PARM_DESC(debug, "activates debug info"); > #define MEM2MEM_HFLIP (1 << 0) > #define MEM2MEM_VFLIP (1 << 1) > > +#define PXP_VERSION_MAJOR(version) \ > + FIELD_GET(BM_PXP_VERSION_MAJOR, version) > +#define PXP_VERSION_MINOR(version) \ > + FIELD_GET(BM_PXP_VERSION_MINOR, version) > + > #define dprintk(dev, fmt, arg...) \ > v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: " fmt, __func__, ## arg) > > @@ -1665,6 +1671,7 @@ static int pxp_probe(struct platform_device *pdev) > struct pxp_dev *dev; > struct video_device *vfd; > int irq; > + u32 hw_version; I'd move this one line up. Up to you, with or without that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > int ret; > > dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL); > @@ -1705,6 +1712,10 @@ static int pxp_probe(struct platform_device *pdev) > goto err_clk; > } > > + hw_version = readl(dev->mmio + HW_PXP_VERSION); > + dev_dbg(&pdev->dev, "PXP Version %u.%u\n", > + PXP_VERSION_MAJOR(hw_version), PXP_VERSION_MINOR(hw_version)); > + > ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); > if (ret) > goto err_clk; >
On Fr, 2023-01-13 at 10:54 +0100, Michael Tretter wrote: > Different versions of the Pixel Pipeline have different blocks and their > routing may be different. Read the PXP_HW_VERSION register to determine > the version of the PXP and print it to the log for debugging purposes. > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c index 689ae5e6ac62..5b671c6e5cae 100644 --- a/drivers/media/platform/nxp/imx-pxp.c +++ b/drivers/media/platform/nxp/imx-pxp.c @@ -10,6 +10,7 @@ * Pawel Osciak, <pawel@osciak.com> * Marek Szyprowski, <m.szyprowski@samsung.com> */ +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/delay.h> #include <linux/dma-mapping.h> @@ -52,6 +53,11 @@ MODULE_PARM_DESC(debug, "activates debug info"); #define MEM2MEM_HFLIP (1 << 0) #define MEM2MEM_VFLIP (1 << 1) +#define PXP_VERSION_MAJOR(version) \ + FIELD_GET(BM_PXP_VERSION_MAJOR, version) +#define PXP_VERSION_MINOR(version) \ + FIELD_GET(BM_PXP_VERSION_MINOR, version) + #define dprintk(dev, fmt, arg...) \ v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: " fmt, __func__, ## arg) @@ -1665,6 +1671,7 @@ static int pxp_probe(struct platform_device *pdev) struct pxp_dev *dev; struct video_device *vfd; int irq; + u32 hw_version; int ret; dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL); @@ -1705,6 +1712,10 @@ static int pxp_probe(struct platform_device *pdev) goto err_clk; } + hw_version = readl(dev->mmio + HW_PXP_VERSION); + dev_dbg(&pdev->dev, "PXP Version %u.%u\n", + PXP_VERSION_MAJOR(hw_version), PXP_VERSION_MINOR(hw_version)); + ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); if (ret) goto err_clk;
Different versions of the Pixel Pipeline have different blocks and their routing may be different. Read the PXP_HW_VERSION register to determine the version of the PXP and print it to the log for debugging purposes. Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> --- Changelog: v2: - reduce debug level for version to dev_dbg - drop hw_version field from struct pxp_dev --- drivers/media/platform/nxp/imx-pxp.c | 11 +++++++++++ 1 file changed, 11 insertions(+)