diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-12-05 16:10:46 +0100 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-12-05 16:10:46 +0100 |
| commit | 608205c082eb4c1326b56fa1525a8106fa7a38c9 (patch) | |
| tree | c5e93dc502a39051051cdbd73c86ab2329b40810 /arch/arm/mach-omap2 | |
| parent | Linux 3.2-rc4 (diff) | |
| parent | iommu/omap: eliminate the public omap_find_iommu_device() method (diff) | |
| download | linux-608205c082eb4c1326b56fa1525a8106fa7a38c9.tar.xz linux-608205c082eb4c1326b56fa1525a8106fa7a38c9.zip | |
Merge branch 'for-joerg' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux into arm/omap
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c15cfada5f13..9ceabf02eeb7 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -28,6 +28,7 @@ #include <plat/board.h> #include <plat/mcbsp.h> #include <plat/mmc.h> +#include <plat/iommu.h> #include <plat/dma.h> #include <plat/omap_hwmod.h> #include <plat/omap_device.h> @@ -211,9 +212,15 @@ static struct platform_device omap3isp_device = { .resource = omap3isp_resources, }; +static struct omap_iommu_arch_data omap3_isp_iommu = { + .name = "isp", +}; + int omap3_init_camera(struct isp_platform_data *pdata) { omap3isp_device.dev.platform_data = pdata; + omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu; + return platform_device_register(&omap3isp_device); } |