Commit 4fcfeca8 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

[media] omap3isp: Replace mmio_base_phys array with the histogram block base

Only the histogram sub-block driver uses the physical address. Do not store
it for other sub-blocks.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 6387b752
...@@ -2247,7 +2247,8 @@ static int isp_map_mem_resource(struct platform_device *pdev, ...@@ -2247,7 +2247,8 @@ static int isp_map_mem_resource(struct platform_device *pdev,
if (IS_ERR(isp->mmio_base[res])) if (IS_ERR(isp->mmio_base[res]))
return PTR_ERR(isp->mmio_base[res]); return PTR_ERR(isp->mmio_base[res]);
isp->mmio_base_phys[res] = mem->start; if (res == OMAP3_ISP_IOMEM_HIST)
isp->mmio_hist_base_phys = mem->start;
return 0; return 0;
} }
......
...@@ -138,8 +138,8 @@ struct isp_xclk { ...@@ -138,8 +138,8 @@ struct isp_xclk {
* @irq_num: Currently used IRQ number. * @irq_num: Currently used IRQ number.
* @mmio_base: Array with kernel base addresses for ioremapped ISP register * @mmio_base: Array with kernel base addresses for ioremapped ISP register
* regions. * regions.
* @mmio_base_phys: Array with physical L4 bus addresses for ISP register * @mmio_hist_base_phys: Physical L4 bus address for ISP hist block register
* regions. * region.
* @mapping: IOMMU mapping * @mapping: IOMMU mapping
* @stat_lock: Spinlock for handling statistics * @stat_lock: Spinlock for handling statistics
* @isp_mutex: Mutex for serializing requests to ISP. * @isp_mutex: Mutex for serializing requests to ISP.
...@@ -175,7 +175,7 @@ struct isp_device { ...@@ -175,7 +175,7 @@ struct isp_device {
unsigned int irq_num; unsigned int irq_num;
void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST]; void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST];
unsigned long mmio_base_phys[OMAP3_ISP_IOMEM_LAST]; unsigned long mmio_hist_base_phys;
struct dma_iommu_mapping *mapping; struct dma_iommu_mapping *mapping;
......
...@@ -193,8 +193,7 @@ static int hist_buf_dma(struct ispstat *hist) ...@@ -193,8 +193,7 @@ static int hist_buf_dma(struct ispstat *hist)
omap3isp_flush(hist->isp); omap3isp_flush(hist->isp);
memset(&cfg, 0, sizeof(cfg)); memset(&cfg, 0, sizeof(cfg));
cfg.src_addr = hist->isp->mmio_base_phys[OMAP3_ISP_IOMEM_HIST] cfg.src_addr = hist->isp->mmio_hist_base_phys + ISPHIST_DATA;
+ ISPHIST_DATA;
cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
cfg.src_maxburst = hist->buf_size / 4; cfg.src_maxburst = hist->buf_size / 4;
......
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