Skip to content

L
linux
Commit 36e5c362 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files
Options

media: imx-pxp: Introduce pxp_read() and pxp_write() wrappers 

Add pxp_read() and pxp_write() functions to wrap readl() and writel()
respectively. This can be useful for debugging register accesses.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8293b3ee
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 54 deletions
drivers/media/platform/nxp/imx-pxp.c
View file @ 36e5c362
...@@ -253,6 +253,16 @@ static struct pxp_q_data *get_q_data(struct pxp_ctx *ctx, ...@@ -253,6 +253,16 @@ static struct pxp_q_data *get_q_data(struct pxp_ctx *ctx,
return &ctx->q_data[V4L2_M2M_DST]; return &ctx->q_data[V4L2_M2M_DST];
} }
static inline u32 pxp_read(struct pxp_dev *dev, u32 reg)
{
return readl(dev->mmio + reg);
}
static inline void pxp_write(struct pxp_dev *dev, u32 reg, u32 value)
{
writel(value, dev->mmio + reg);
}
static u32 pxp_v4l2_pix_fmt_to_ps_format(u32 v4l2_pix_fmt) static u32 pxp_v4l2_pix_fmt_to_ps_format(u32 v4l2_pix_fmt)
{ {
switch (v4l2_pix_fmt) { switch (v4l2_pix_fmt) {
...@@ -505,11 +515,11 @@ static void pxp_setup_csc(struct pxp_ctx *ctx) ...@@ -505,11 +515,11 @@ static void pxp_setup_csc(struct pxp_ctx *ctx)
csc1_coef = csc1_coef_smpte240m_lim; csc1_coef = csc1_coef_smpte240m_lim;
} }
writel(csc1_coef[0], dev->mmio + HW_PXP_CSC1_COEF0); pxp_write(dev, HW_PXP_CSC1_COEF0, csc1_coef[0]);
writel(csc1_coef[1], dev->mmio + HW_PXP_CSC1_COEF1); pxp_write(dev, HW_PXP_CSC1_COEF1, csc1_coef[1]);
writel(csc1_coef[2], dev->mmio + HW_PXP_CSC1_COEF2); pxp_write(dev, HW_PXP_CSC1_COEF2, csc1_coef[2]);
} else { } else {
writel(BM_PXP_CSC1_COEF0_BYPASS, dev->mmio + HW_PXP_CSC1_COEF0); pxp_write(dev, HW_PXP_CSC1_COEF0, BM_PXP_CSC1_COEF0_BYPASS);
} }
if (!pxp_v4l2_pix_fmt_is_yuv(ctx->q_data[V4L2_M2M_SRC].fmt->fourcc) && if (!pxp_v4l2_pix_fmt_is_yuv(ctx->q_data[V4L2_M2M_SRC].fmt->fourcc) &&
...@@ -725,15 +735,15 @@ static void pxp_setup_csc(struct pxp_ctx *ctx) ...@@ -725,15 +735,15 @@ static void pxp_setup_csc(struct pxp_ctx *ctx)
BP_PXP_CSC2_CTRL_CSC_MODE; BP_PXP_CSC2_CTRL_CSC_MODE;
} }
writel(csc2_ctrl, dev->mmio + HW_PXP_CSC2_CTRL); pxp_write(dev, HW_PXP_CSC2_CTRL, csc2_ctrl);
writel(csc2_coef[0], dev->mmio + HW_PXP_CSC2_COEF0); pxp_write(dev, HW_PXP_CSC2_COEF0, csc2_coef[0]);
writel(csc2_coef[1], dev->mmio + HW_PXP_CSC2_COEF1); pxp_write(dev, HW_PXP_CSC2_COEF1, csc2_coef[1]);
writel(csc2_coef[2], dev->mmio + HW_PXP_CSC2_COEF2); pxp_write(dev, HW_PXP_CSC2_COEF2, csc2_coef[2]);
writel(csc2_coef[3], dev->mmio + HW_PXP_CSC2_COEF3); pxp_write(dev, HW_PXP_CSC2_COEF3, csc2_coef[3]);
writel(csc2_coef[4], dev->mmio + HW_PXP_CSC2_COEF4); pxp_write(dev, HW_PXP_CSC2_COEF4, csc2_coef[4]);
writel(csc2_coef[5], dev->mmio + HW_PXP_CSC2_COEF5); pxp_write(dev, HW_PXP_CSC2_COEF5, csc2_coef[5]);
} else { } else {
writel(BM_PXP_CSC2_CTRL_BYPASS, dev->mmio + HW_PXP_CSC2_CTRL); pxp_write(dev, HW_PXP_CSC2_CTRL, BM_PXP_CSC2_CTRL_BYPASS);
} }
} }
...@@ -810,8 +820,8 @@ static void pxp_set_data_path(struct pxp_ctx *ctx) ...@@ -810,8 +820,8 @@ static void pxp_set_data_path(struct pxp_ctx *ctx)
ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(3); ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(3);
ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(3); ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(3);
writel(ctrl0, dev->mmio + HW_PXP_DATA_PATH_CTRL0); pxp_write(dev, HW_PXP_DATA_PATH_CTRL0, ctrl0);
writel(ctrl1, dev->mmio + HW_PXP_DATA_PATH_CTRL1); pxp_write(dev, HW_PXP_DATA_PATH_CTRL1, ctrl1);
} }
static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb, static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb,
...@@ -967,48 +977,48 @@ static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb, ...@@ -967,48 +977,48 @@ static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb,
BF_PXP_PS_SCALE_XSCALE(xscale); BF_PXP_PS_SCALE_XSCALE(xscale);
ps_offset = BF_PXP_PS_OFFSET_YOFFSET(0) | BF_PXP_PS_OFFSET_XOFFSET(0); ps_offset = BF_PXP_PS_OFFSET_YOFFSET(0) | BF_PXP_PS_OFFSET_XOFFSET(0);
writel(ctrl, dev->mmio + HW_PXP_CTRL); pxp_write(dev, HW_PXP_CTRL, ctrl);
/* skip STAT */ /* skip STAT */
writel(out_ctrl, dev->mmio + HW_PXP_OUT_CTRL); pxp_write(dev, HW_PXP_OUT_CTRL, out_ctrl);
writel(out_buf, dev->mmio + HW_PXP_OUT_BUF); pxp_write(dev, HW_PXP_OUT_BUF, out_buf);
writel(out_buf2, dev->mmio + HW_PXP_OUT_BUF2); pxp_write(dev, HW_PXP_OUT_BUF2, out_buf2);
writel(out_pitch, dev->mmio + HW_PXP_OUT_PITCH); pxp_write(dev, HW_PXP_OUT_PITCH, out_pitch);
writel(out_lrc, dev->mmio + HW_PXP_OUT_LRC); pxp_write(dev, HW_PXP_OUT_LRC, out_lrc);
writel(out_ps_ulc, dev->mmio + HW_PXP_OUT_PS_ULC); pxp_write(dev, HW_PXP_OUT_PS_ULC, out_ps_ulc);
writel(out_ps_lrc, dev->mmio + HW_PXP_OUT_PS_LRC); pxp_write(dev, HW_PXP_OUT_PS_LRC, out_ps_lrc);
writel(as_ulc, dev->mmio + HW_PXP_OUT_AS_ULC); pxp_write(dev, HW_PXP_OUT_AS_ULC, as_ulc);
writel(as_lrc, dev->mmio + HW_PXP_OUT_AS_LRC); pxp_write(dev, HW_PXP_OUT_AS_LRC, as_lrc);
writel(ps_ctrl, dev->mmio + HW_PXP_PS_CTRL); pxp_write(dev, HW_PXP_PS_CTRL, ps_ctrl);
writel(ps_buf, dev->mmio + HW_PXP_PS_BUF); pxp_write(dev, HW_PXP_PS_BUF, ps_buf);
writel(ps_ubuf, dev->mmio + HW_PXP_PS_UBUF); pxp_write(dev, HW_PXP_PS_UBUF, ps_ubuf);
writel(ps_vbuf, dev->mmio + HW_PXP_PS_VBUF); pxp_write(dev, HW_PXP_PS_VBUF, ps_vbuf);
writel(ps_pitch, dev->mmio + HW_PXP_PS_PITCH); pxp_write(dev, HW_PXP_PS_PITCH, ps_pitch);
writel(0x00ffffff, dev->mmio + HW_PXP_PS_BACKGROUND_0); pxp_write(dev, HW_PXP_PS_BACKGROUND_0, 0x00ffffff);
writel(ps_scale, dev->mmio + HW_PXP_PS_SCALE); pxp_write(dev, HW_PXP_PS_SCALE, ps_scale);
writel(ps_offset, dev->mmio + HW_PXP_PS_OFFSET); pxp_write(dev, HW_PXP_PS_OFFSET, ps_offset);
/* disable processed surface color keying */ /* disable processed surface color keying */
writel(0x00ffffff, dev->mmio + HW_PXP_PS_CLRKEYLOW_0); pxp_write(dev, HW_PXP_PS_CLRKEYLOW_0, 0x00ffffff);
writel(0x00000000, dev->mmio + HW_PXP_PS_CLRKEYHIGH_0); pxp_write(dev, HW_PXP_PS_CLRKEYHIGH_0, 0x00000000);
/* disable alpha surface color keying */ /* disable alpha surface color keying */
writel(0x00ffffff, dev->mmio + HW_PXP_AS_CLRKEYLOW_0); pxp_write(dev, HW_PXP_AS_CLRKEYLOW_0, 0x00ffffff);
writel(0x00000000, dev->mmio + HW_PXP_AS_CLRKEYHIGH_0); pxp_write(dev, HW_PXP_AS_CLRKEYHIGH_0, 0x00000000);
/* setup CSC */ /* setup CSC */
pxp_setup_csc(ctx); pxp_setup_csc(ctx);
/* bypass LUT */ /* bypass LUT */
writel(BM_PXP_LUT_CTRL_BYPASS, dev->mmio + HW_PXP_LUT_CTRL); pxp_write(dev, HW_PXP_LUT_CTRL, BM_PXP_LUT_CTRL_BYPASS);
pxp_set_data_path(ctx); pxp_set_data_path(ctx);
writel(0xffff, dev->mmio + HW_PXP_IRQ_MASK); pxp_write(dev, HW_PXP_IRQ_MASK, 0xffff);
/* ungate, enable PS/AS/OUT and PXP operation */ /* ungate, enable PS/AS/OUT and PXP operation */
writel(BM_PXP_CTRL_IRQ_ENABLE, dev->mmio + HW_PXP_CTRL_SET); pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_IRQ_ENABLE);
writel(BM_PXP_CTRL_ENABLE | BM_PXP_CTRL_ENABLE_CSC2 | pxp_write(dev, HW_PXP_CTRL_SET,
BM_PXP_CTRL_ENABLE_ROTATE0 | BM_PXP_CTRL_ENABLE | BM_PXP_CTRL_ENABLE_CSC2 |
BM_PXP_CTRL_ENABLE_PS_AS_OUT, dev->mmio + HW_PXP_CTRL_SET); BM_PXP_CTRL_ENABLE_ROTATE0 | BM_PXP_CTRL_ENABLE_PS_AS_OUT);
return 0; return 0;
} }
...@@ -1081,23 +1091,23 @@ static irqreturn_t pxp_irq_handler(int irq, void *dev_id) ...@@ -1081,23 +1091,23 @@ static irqreturn_t pxp_irq_handler(int irq, void *dev_id)
struct pxp_dev *dev = dev_id; struct pxp_dev *dev = dev_id;
u32 stat; u32 stat;
stat = readl(dev->mmio + HW_PXP_STAT); stat = pxp_read(dev, HW_PXP_STAT);
if (stat & BM_PXP_STAT_IRQ0) { if (stat & BM_PXP_STAT_IRQ0) {
/* we expect x = 0, y = height, irq0 = 1 */ /* we expect x = 0, y = height, irq0 = 1 */
if (stat & ~(BM_PXP_STAT_BLOCKX | BM_PXP_STAT_BLOCKY | if (stat & ~(BM_PXP_STAT_BLOCKX | BM_PXP_STAT_BLOCKY |
BM_PXP_STAT_IRQ0)) BM_PXP_STAT_IRQ0))
dprintk(dev, "%s: stat = 0x%08x\n", __func__, stat); dprintk(dev, "%s: stat = 0x%08x\n", __func__, stat);
writel(BM_PXP_STAT_IRQ0, dev->mmio + HW_PXP_STAT_CLR); pxp_write(dev, HW_PXP_STAT_CLR, BM_PXP_STAT_IRQ0);
pxp_job_finish(dev); pxp_job_finish(dev);
} else { } else {
u32 irq = readl(dev->mmio + HW_PXP_IRQ); u32 irq = pxp_read(dev, HW_PXP_IRQ);
dprintk(dev, "%s: stat = 0x%08x\n", __func__, stat); dprintk(dev, "%s: stat = 0x%08x\n", __func__, stat);
dprintk(dev, "%s: irq = 0x%08x\n", __func__, irq); dprintk(dev, "%s: irq = 0x%08x\n", __func__, irq);
writel(irq, dev->mmio + HW_PXP_IRQ_CLR); pxp_write(dev, HW_PXP_IRQ_CLR, irq);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -1741,18 +1751,18 @@ static int pxp_soft_reset(struct pxp_dev *dev) ...@@ -1741,18 +1751,18 @@ static int pxp_soft_reset(struct pxp_dev *dev)
int ret; int ret;
u32 val; u32 val;
writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR); pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_SFTRST);
writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR); pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_CLKGATE);
writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_SET); pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_SFTRST);
ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val, ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val,
val & BM_PXP_CTRL_CLKGATE, 0, 100); val & BM_PXP_CTRL_CLKGATE, 0, 100);
if (ret < 0) if (ret < 0)
return ret; return ret;
writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR); pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_SFTRST);
writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR); pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_CLKGATE);
return 0; return 0;
} }
...@@ -1805,7 +1815,7 @@ static int pxp_probe(struct platform_device *pdev) ...@@ -1805,7 +1815,7 @@ static int pxp_probe(struct platform_device *pdev)
goto err_clk; goto err_clk;
} }
hw_version = readl(dev->mmio + HW_PXP_VERSION); hw_version = pxp_read(dev, HW_PXP_VERSION);
dev_dbg(&pdev->dev, "PXP Version %u.%u\n", dev_dbg(&pdev->dev, "PXP Version %u.%u\n",
PXP_VERSION_MAJOR(hw_version), PXP_VERSION_MINOR(hw_version)); PXP_VERSION_MAJOR(hw_version), PXP_VERSION_MINOR(hw_version));
...@@ -1883,8 +1893,8 @@ static int pxp_remove(struct platform_device *pdev) ...@@ -1883,8 +1893,8 @@ static int pxp_remove(struct platform_device *pdev)
{ {
struct pxp_dev *dev = platform_get_drvdata(pdev); struct pxp_dev *dev = platform_get_drvdata(pdev);
writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_SET); pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_CLKGATE);
writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_SET); pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_SFTRST);
clk_disable_unprepare(dev->clk); clk_disable_unprepare(dev->clk);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7