summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/devices-imx27.h
diff options
context:
space:
mode:
authorGaëtan Carlier <gcembed@gmail.com>2012-09-05 13:06:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 16:21:48 +0100
commit3ab3a350200c14350220fffde893f3afb640fd25 (patch)
tree8c8e537f4159ebafe97dc5977b7efd90015eb6f2 /arch/arm/mach-imx/devices-imx27.h
parent89a4150331bc07014256714678ce8e9b238fc145 (diff)
downloadlinux-3ab3a350200c14350220fffde893f3afb640fd25.tar.bz2
ARM : i.MX27 : split code for allocation of ressources of camera and eMMA
This is to prepare addition of m2m-emmapp driver otherwise IMX_HAVE_PLATFORM_MX2_CAMERA must be declared even if only Post-Processor is needed. IMX_HAVE_PLATFORM_MX2_EMMA define has been added. Changes since v1: - Add "select IMX_HAVE_PLATFORM_MX2_EMMA" for MACH_IMX27_VISSTRIM_M10 platform due to pending patch in linux-media tree that will call imx27_add_mx2_emmaprp(). Signed-off-by: Gaëtan Carlier <gcembed@gmail.com> Acked-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/devices-imx27.h')
-rw-r--r--arch/arm/mach-imx/devices-imx27.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/devices-imx27.h b/arch/arm/mach-imx/devices-imx27.h
index 8a1ad7972d4c..130962519751 100644
--- a/arch/arm/mach-imx/devices-imx27.h
+++ b/arch/arm/mach-imx/devices-imx27.h
@@ -53,8 +53,10 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[];
extern const struct imx_mx2_camera_data imx27_mx2_camera_data;
#define imx27_add_mx2_camera(pdata) \
imx_add_mx2_camera(&imx27_mx2_camera_data, pdata)
+
+extern const struct imx_mx2_emma_data imx27_mx2_emmaprp_data;
#define imx27_add_mx2_emmaprp() \
- imx_add_mx2_emmaprp(&imx27_mx2_camera_data)
+ imx_add_mx2_emmaprp(&imx27_mx2_emmaprp_data)
extern const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data;
#define imx27_add_mxc_ehci_otg(pdata) \