From: Robby Cai <R63905@freescale.com>
Date: Tue, 21 Aug 2012 05:46:43 +0000 (+0800)
Subject: ENGR00220796-3: imx6sl arm2/evk: Add platform_device for V4L2 support
X-Git-Tag: v3.0.35-fsl_4.1.0~701
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38889fe91e09516d586cb9d860b9f5a487fe2073;p=karo-tx-linux.git

ENGR00220796-3: imx6sl arm2/evk: Add platform_device for V4L2 support

Add platform device for V4L2 support

Signed-off-by: Robby Cai <R63905@freescale.com>
---

diff --git a/arch/arm/mach-mx6/board-mx6sl_arm2.c b/arch/arm/mach-mx6/board-mx6sl_arm2.c
index d1cf110f6c3b..45b33c9caace 100755
--- a/arch/arm/mach-mx6/board-mx6sl_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6sl_arm2.c
@@ -1260,6 +1260,7 @@ static void __init mx6_arm2_init(void)
 	imx6q_add_busfreq();
 	imx6sl_add_dcp();
 	imx6sl_add_rngb();
+	imx6sl_add_imx_pxp_v4l2();
 
 	imx6q_add_perfmon(0);
 	imx6q_add_perfmon(1);
diff --git a/arch/arm/mach-mx6/board-mx6sl_evk.c b/arch/arm/mach-mx6/board-mx6sl_evk.c
index 11623ccc68e7..40c05c451e7a 100644
--- a/arch/arm/mach-mx6/board-mx6sl_evk.c
+++ b/arch/arm/mach-mx6/board-mx6sl_evk.c
@@ -1267,6 +1267,7 @@ static void __init mx6_evk_init(void)
 	imx6q_add_busfreq();
 	imx6sl_add_dcp();
 	imx6sl_add_rngb();
+	imx6sl_add_imx_pxp_v4l2();
 
 	imx6q_add_perfmon(0);
 	imx6q_add_perfmon(1);
diff --git a/arch/arm/mach-mx6/devices-imx6q.h b/arch/arm/mach-mx6/devices-imx6q.h
index c75aed86800b..f91369ffc280 100644
--- a/arch/arm/mach-mx6/devices-imx6q.h
+++ b/arch/arm/mach-mx6/devices-imx6q.h
@@ -220,6 +220,9 @@ extern const struct imx_pxp_data imx6dl_pxp_data __initconst;
 #define imx6dl_add_imx_pxp_client()   \
 	imx_add_imx_pxp_client()
 
+#define imx6sl_add_imx_pxp_v4l2()   \
+	imx_add_imx_pxp_v4l2()
+
 extern const struct imx_epdc_data imx6dl_epdc_data __initconst;
 #define imx6dl_add_imx_epdc(pdata)	\
 	imx_add_imx_epdc(&imx6dl_epdc_data, pdata)
diff --git a/arch/arm/plat-mxc/devices/platform-imx-pxp.c b/arch/arm/plat-mxc/devices/platform-imx-pxp.c
index 3ae3e4880e1d..418489e1c4ea 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-pxp.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-pxp.c
@@ -64,3 +64,8 @@ struct platform_device *__init imx_add_imx_pxp_client()
 		NULL, 0, NULL, 0);
 }
 
+struct platform_device *__init imx_add_imx_pxp_v4l2()
+{
+    return imx_add_platform_device_dmamask("pxp-v4l2", -1,
+		NULL, 0, NULL, 0, DMA_BIT_MASK(32));
+}
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 4512751cbd11..99ef8abee1e3 100755
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -468,6 +468,7 @@ struct imx_pxp_data {
 struct platform_device *__init imx_add_imx_pxp(
 	const struct imx_pxp_data *data);
 struct platform_device *__init imx_add_imx_pxp_client(void);
+struct platform_device *__init imx_add_imx_pxp_v4l2(void);
 
 #include <linux/fsl_devices.h>
 struct imx_elcdif_data {