iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] omap2: Fix camera resources for multiomap

Browse Source 
Make sure the kernel can be compiled with both OMAP2 and OMAP3 camera
support linked in, and give public symbols proper omap2/omap3 prefixes.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sergio Aguirre 2010-11-15 11:29:54 -03:00 committed by Mauro Carvalho Chehab
parent a11f6706ca
commit cfe2cde6d3
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/mach-omap2/devices.c
View File

@ -38,7 +38,7 @@
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
static struct resource cam_resources[] = { static struct resource omap2cam_resources[] = {
{ {
.start = OMAP24XX_CAMERA_BASE, .start = OMAP24XX_CAMERA_BASE,
.end = OMAP24XX_CAMERA_BASE + 0xfff, .end = OMAP24XX_CAMERA_BASE + 0xfff,
@ -50,21 +50,12 @@ static struct resource cam_resources[] = {
} }
}; };
static struct platform_device omap_cam_device = { static struct platform_device omap2cam_device = {
.name = "omap24xxcam", .name = "omap24xxcam",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(cam_resources), .num_resources = ARRAY_SIZE(omap2cam_resources),
.resource = cam_resources, .resource = omap2cam_resources,
}; };
static inline void omap_init_camera(void)
{
platform_device_register(&omap_cam_device);
}
#else
static inline void omap_init_camera(void)
{
}
#endif #endif
static struct resource omap3isp_resources[] = { static struct resource omap3isp_resources[] = {
@ -157,6 +148,14 @@ int omap3_init_camera(struct isp_platform_data *pdata)
return platform_device_register(&omap3isp_device); return platform_device_register(&omap3isp_device);
} }
static inline void omap_init_camera(void)
{
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
if (cpu_is_omap24xx())
platform_device_register(&omap2cam_device);
#endif
}
#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE) #if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
#define MBOX_REG_SIZE 0x120 #define MBOX_REG_SIZE 0x120