p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Sakari Ailus 2015-03-25 19:57:33 -03:00 committed by Mauro Carvalho Chehab
parent 6387b75284
commit 4fcfeca833
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/omap3isp/isp.c
View File

@ -2247,7 +2247,8 @@ static int isp_map_mem_resource(struct platform_device *pdev,
if (IS_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;
}

6
drivers/media/platform/omap3isp/isp.h
View File

@ -138,8 +138,8 @@ struct isp_xclk {
* @irq_num: Currently used IRQ number.
* @mmio_base: Array with kernel base addresses for ioremapped ISP register
* regions.
* @mmio_base_phys: Array with physical L4 bus addresses for ISP register
* regions.
* @mmio_hist_base_phys: Physical L4 bus address for ISP hist block register
* region.
* @mapping: IOMMU mapping
* @stat_lock: Spinlock for handling statistics
* @isp_mutex: Mutex for serializing requests to ISP.
@ -175,7 +175,7 @@ struct isp_device {
unsigned int irq_num;
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;

3
drivers/media/platform/omap3isp/isphist.c
View File

@ -193,8 +193,7 @@ static int hist_buf_dma(struct ispstat *hist)
omap3isp_flush(hist->isp);
memset(&cfg, 0, sizeof(cfg));
cfg.src_addr = hist->isp->mmio_base_phys[OMAP3_ISP_IOMEM_HIST]
+ ISPHIST_DATA;
cfg.src_addr = hist->isp->mmio_hist_base_phys + ISPHIST_DATA;
cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
cfg.src_maxburst = hist->buf_size / 4;