aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorOhad Ben-Cohen <ohad@wizery.com>2011-09-23 09:44:57 -0400
committerOhad Ben-Cohen <ohad@wizery.com>2011-12-05 08:44:12 -0500
commitc8eaab3b74f1326c989e1db8d7c0c14981556e4e (patch)
tree41663d0073bfaa6d0d1c56b4c60247d1906e78a1 /arch/arm/mach-omap2
parent1fa02ac9536c9a5278e999e40e274bba62c23a4d (diff)
ARM: OMAP3: bind omap3isp_device to its iommu device
Bind OMAP3's isp device to the isp's dedicated iommu, by setting the device's archdata iommu member. This way omap3isp will be able to use the generic IOMMU API without having to call any omap-specific binding method. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/devices.c7
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 @@
28#include <plat/board.h> 28#include <plat/board.h>
29#include <plat/mcbsp.h> 29#include <plat/mcbsp.h>
30#include <plat/mmc.h> 30#include <plat/mmc.h>
31#include <plat/iommu.h>
31#include <plat/dma.h> 32#include <plat/dma.h>
32#include <plat/omap_hwmod.h> 33#include <plat/omap_hwmod.h>
33#include <plat/omap_device.h> 34#include <plat/omap_device.h>
@@ -211,9 +212,15 @@ static struct platform_device omap3isp_device = {
211 .resource = omap3isp_resources, 212 .resource = omap3isp_resources,
212}; 213};
213 214
215static struct omap_iommu_arch_data omap3_isp_iommu = {
216 .name = "isp",
217};
218
214int omap3_init_camera(struct isp_platform_data *pdata) 219int omap3_init_camera(struct isp_platform_data *pdata)
215{ 220{
216 omap3isp_device.dev.platform_data = pdata; 221 omap3isp_device.dev.platform_data = pdata;
222 omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;
223
217 return platform_device_register(&omap3isp_device); 224 return platform_device_register(&omap3isp_device);
218} 225}
219 226