diff options
| author | Laurent Pinchart | 2014-01-02 14:27:12 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-05-25 16:09:25 +0200 |
| commit | cbde9e9d7f2ad0eb9c61563540ef1427e380c5e1 (patch) | |
| tree | dbfcab5cd6dc0e538075871cb3c688aa98450b3c /drivers/media/platform/omap3isp/isph3a_af.c | |
| parent | [media] omap3isp: stat: Share common code for buffer allocation (diff) | |
| download | kernel-qcow2-linux-cbde9e9d7f2ad0eb9c61563540ef1427e380c5e1.tar.gz kernel-qcow2-linux-cbde9e9d7f2ad0eb9c61563540ef1427e380c5e1.tar.xz kernel-qcow2-linux-cbde9e9d7f2ad0eb9c61563540ef1427e380c5e1.zip | |
[media] omap3isp: stat: Merge dma_addr and iommu_addr fields
The fields store buffer addresses as seen from the device. The first one
is used with an external DMA engine while the second one is used with
the ISP DMA engine. As they're never used together, merge them.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isph3a_af.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isph3a_af.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/omap3isp/isph3a_af.c b/drivers/media/platform/omap3isp/isph3a_af.c index a0bf5af32438..6fc960cd30f5 100644 --- a/drivers/media/platform/omap3isp/isph3a_af.c +++ b/drivers/media/platform/omap3isp/isph3a_af.c @@ -51,7 +51,7 @@ static void h3a_af_setup_regs(struct ispstat *af, void *priv) if (af->state == ISPSTAT_DISABLED) return; - isp_reg_writel(af->isp, af->active_buf->iommu_addr, OMAP3_ISP_IOMEM_H3A, + isp_reg_writel(af->isp, af->active_buf->dma_addr, OMAP3_ISP_IOMEM_H3A, ISPH3A_AFBUFST); if (!af->update) |