projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux.git]
/
arch
/
arm
/
mach-omap2
/
devices.c
diff --git
a/arch/arm/mach-omap2/devices.c
b/arch/arm/mach-omap2/devices.c
index 0dd6398bade4787510c4d5c62210b7a61cfb7595..e58609b312c7091b5589314fbb4b457b457ccb0f 100644
(file)
--- a/
arch/arm/mach-omap2/devices.c
+++ b/
arch/arm/mach-omap2/devices.c
@@
-229,6
+229,9
@@
static struct omap_iommu_arch_data omap3_isp_iommu = {
int omap3_init_camera(struct isp_platform_data *pdata)
{
+ if (of_have_populated_dt())
+ omap3_isp_iommu.name = "480bd400.mmu";
+
omap3isp_device.dev.platform_data = pdata;
omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;