X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fdevices.c;h=f0e601c78c47ac9aebec4059e1eb94ddebb0a142;hb=39a389e5729342bd7d0551e55f326d4497418952;hp=c7de03ea9309bb8109dd167ec7443514cdee7b03;hpb=4384c4688e1577e386b8961594f079f7ea22abe4;p=linux-2.6-omap-h63xx.git diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c7de03ea930..f0e601c78c4 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -46,6 +46,32 @@ static struct platform_device omap_cam_device = { .resource = cam_resources, }; +static inline void omap_init_camera(void) +{ + platform_device_register(&omap_cam_device); +} + +#elif defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) + +static struct resource cam_resources[] = { + { + .start = OMAP34XX_CAMERA_BASE, + .end = OMAP34XX_CAMERA_BASE + 0x1B70, + .flags = IORESOURCE_MEM, + }, + { + .start = INT_34XX_CAM_IRQ, + .flags = IORESOURCE_IRQ, + } +}; + +static struct platform_device omap_cam_device = { + .name = "omap34xxcam", + .id = -1, + .num_resources = ARRAY_SIZE(cam_resources), + .resource = cam_resources, +}; + static inline void omap_init_camera(void) { platform_device_register(&omap_cam_device);