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

Commit b2997cb1 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: dynamically allocate mx2-camera device 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 3bde75b5

arch/arm/mach-imx/devices-imx27.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst; 
#define imx27_add_imx_uart4(pdata)	imx27_add_imx_uart(4, pdata)

#define imx27_add_imx_uart5(pdata)	imx27_add_imx_uart(5, pdata)



extern const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst;

#define imx27_add_mx2_camera(pdata)	\

	imx_add_mx2_camera(&imx27_mx2_camera_data, pdata)



extern const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst;

#define imx27_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)

arch/arm/mach-imx/devices.c

+0 −32
Original line number Diff line number Diff line
@@ -77,38 +77,6 @@ int __init imx1_register_gpios(void) 
#endif



#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)



#ifdef CONFIG_MACH_MX27

static struct resource mx27_camera_resources[] = {

	{

	       .start = MX27_CSI_BASE_ADDR,

	       .end = MX27_CSI_BASE_ADDR + 0x1f,

	       .flags = IORESOURCE_MEM,

	}, {

	       .start = MX27_EMMA_PRP_BASE_ADDR,

	       .end = MX27_EMMA_PRP_BASE_ADDR + 0x1f,

	       .flags = IORESOURCE_MEM,

	}, {

	       .start = MX27_INT_CSI,

	       .end = MX27_INT_CSI,

	       .flags = IORESOURCE_IRQ,

	},{

	       .start = MX27_INT_EMMAPRP,

	       .end = MX27_INT_EMMAPRP,

	       .flags = IORESOURCE_IRQ,

	},

};

struct platform_device mx27_camera_device = {

	.name = "mx2-camera",

	.id = 0,

	.num_resources = ARRAY_SIZE(mx27_camera_resources),

	.resource = mx27_camera_resources,

	.dev = {

		.coherent_dma_mask = 0xffffffff,

	},

};

#endif



/* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */

static struct resource mxc_wdt_resources[] = {

	{

arch/arm/mach-imx/devices.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ extern struct platform_device mxc_pwm_device; 
extern struct platform_device mxc_sdhc_device0;

extern struct platform_device mxc_sdhc_device1;

extern struct platform_device mxc_otg_udc_device;

extern struct platform_device mx27_camera_device;

extern struct platform_device mxc_otg_host;

extern struct platform_device mxc_usbh1;

extern struct platform_device mxc_usbh2;

arch/arm/plat-mxc/devices/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ config IMX_HAVE_PLATFORM_IMX_UDC 
config IMX_HAVE_PLATFORM_MX1_CAMERA

	bool



config IMX_HAVE_PLATFORM_MX2_CAMERA

	bool



config IMX_HAVE_PLATFORM_MXC_NAND

	bool

arch/arm/plat-mxc/devices/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o