Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfe2cde6 authored by Sergio Aguirre's avatar Sergio Aguirre Committed by Mauro Carvalho Chehab
Browse files

[media] omap2: Fix camera resources for multiomap 



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: default avatarSergio Aguirre <saaguirre@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a11f6706

arch/arm/mach-omap2/devices.c

+12 −13
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)



static struct resource cam_resources[] = {

static struct resource omap2cam_resources[] = {

	{

		.start		= OMAP24XX_CAMERA_BASE,

		.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",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(cam_resources),

	.resource	= cam_resources,

	.num_resources	= ARRAY_SIZE(omap2cam_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



static struct resource omap3isp_resources[] = {
@@ -157,6 +148,14 @@ int omap3_init_camera(struct isp_platform_data *pdata) 
	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)



#define MBOX_REG_SIZE   0x120