From bb4c853ff18fe3b0e2aec45053c318479e0c55e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 11 Nov 2010 17:11:34 +0100 Subject: ARM: mx25: dynamically allocate mx2-camera devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Uwe Kleine-König --- arch/arm/plat-mxc/devices/platform-mx2-camera.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'arch/arm/plat-mxc/devices') diff --git a/arch/arm/plat-mxc/devices/platform-mx2-camera.c b/arch/arm/plat-mxc/devices/platform-mx2-camera.c index a18c80355de0..b3f4828dc447 100644 --- a/arch/arm/plat-mxc/devices/platform-mx2-camera.c +++ b/arch/arm/plat-mxc/devices/platform-mx2-camera.c @@ -10,6 +10,12 @@ #include #define imx_mx2_camera_data_entry_single(soc) \ + { \ + .iobasecsi = soc ## _CSI_BASE_ADDR, \ + .iosizecsi = SZ_4K, \ + .irqcsi = soc ## _INT_CSI, \ + } +#define imx_mx2_camera_data_entry_single_emma(soc) \ { \ .iobasecsi = soc ## _CSI_BASE_ADDR, \ .iosizecsi = SZ_32, \ @@ -19,9 +25,14 @@ .irqemmaprp = soc ## _INT_EMMAPRP, \ } +#ifdef CONFIG_SOC_IMX25 +const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst = + imx_mx2_camera_data_entry_single(MX25); +#endif /* ifdef CONFIG_SOC_IMX25 */ + #ifdef CONFIG_SOC_IMX27 const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst = - imx_mx2_camera_data_entry_single(MX27); + imx_mx2_camera_data_entry_single_emma(MX27); #endif /* ifdef CONFIG_SOC_IMX27 */ struct platform_device *__init imx_add_mx2_camera( @@ -33,14 +44,14 @@ struct platform_device *__init imx_add_mx2_camera( .start = data->iobasecsi, .end = data->iobasecsi + data->iosizecsi - 1, .flags = IORESOURCE_MEM, - }, { - .start = data->iobaseemmaprp, - .end = data->iobaseemmaprp + data->iosizeemmaprp - 1, - .flags = IORESOURCE_MEM, }, { .start = data->irqcsi, .end = data->irqcsi, .flags = IORESOURCE_IRQ, + }, { + .start = data->iobaseemmaprp, + .end = data->iobaseemmaprp + data->iosizeemmaprp - 1, + .flags = IORESOURCE_MEM, }, { .start = data->irqemmaprp, .end = data->irqemmaprp, @@ -48,6 +59,6 @@ struct platform_device *__init imx_add_mx2_camera( }, }; return imx_add_platform_device_dmamask("mx2-camera", 0, - res, ARRAY_SIZE(res), + res, data->iobaseemmaprp ? 4 : 2, pdata, sizeof(*pdata), DMA_BIT_MASK(32)); } -- cgit v1.2.2