git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d4c00d
)
[media] omap3isp: stat: Merge dma_addr and iommu_addr fields
author
Laurent Pinchart
<laurent.pinchart@ideasonboard.com>
Thu, 2 Jan 2014 13:27:12 +0000
(10:27 -0300)
committer
Mauro Carvalho Chehab
<m.chehab@samsung.com>
Sun, 25 May 2014 14:09:25 +0000
(11:09 -0300)
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>
drivers/media/platform/omap3isp/isph3a_aewb.c
patch
|
blob
|
history
drivers/media/platform/omap3isp/isph3a_af.c
patch
|
blob
|
history
drivers/media/platform/omap3isp/ispstat.c
patch
|
blob
|
history
drivers/media/platform/omap3isp/ispstat.h
patch
|
blob
|
history
diff --cc
drivers/media/platform/omap3isp/isph3a_aewb.c
Simple merge
diff --cc
drivers/media/platform/omap3isp/isph3a_af.c
Simple merge
diff --cc
drivers/media/platform/omap3isp/ispstat.c
Simple merge
diff --cc
drivers/media/platform/omap3isp/ispstat.h
Simple merge