summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2010-08-31 19:30:19 +0800
committerRobby Cai <R63905@freescale.com>2010-09-01 15:05:58 +0800
commit0a433b8654e4fad122850fc3d1e955d054ee4d9b (patch)
tree4e6b65fde4cdc19dd298310a82a6fe95badce368
parent2656f9a25b97f25f8154cc2a1db4511eb0f92bf1 (diff)
ENGR00126313-1 MX50: Add platform data for V4L2 device
Add MSL codes for PxP v4l2 device Signed-off-by: Robby Cai <R63905@freescale.com>
-rw-r--r--arch/arm/mach-mx5/devices.c10
-rw-r--r--arch/arm/mach-mx5/devices.h1
-rw-r--r--arch/arm/mach-mx5/mx50_arm2.c1
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index 62f1b75c093f..13578df8128b 100644
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -1380,6 +1380,16 @@ struct platform_device mxc_pxp_client_device = {
.id = -1,
};
+static u64 pxp_dma_mask = DMA_BIT_MASK(32);
+struct platform_device mxc_pxp_v4l2 = {
+ .name = "pxp-v4l2",
+ .id = -1,
+ .dev = {
+ .dma_mask = &pxp_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+};
+
struct platform_device mxc_v4l2_device = {
.name = "mxc_v4l2_capture",
.id = 0,
diff --git a/arch/arm/mach-mx5/devices.h b/arch/arm/mach-mx5/devices.h
index 221ba920ce85..8f72ec54fced 100644
--- a/arch/arm/mach-mx5/devices.h
+++ b/arch/arm/mach-mx5/devices.h
@@ -69,6 +69,7 @@ extern struct platform_device mxc_mlb_device;
extern struct platform_device mxc_nandv2_mtd_device;
extern struct platform_device mxc_pxp_device;
extern struct platform_device mxc_pxp_client_device;
+extern struct platform_device mxc_pxp_v4l2;
extern struct platform_device epdc_device;
extern struct platform_device elcdif_device;
extern struct platform_device mxc_v4l2_device;
diff --git a/arch/arm/mach-mx5/mx50_arm2.c b/arch/arm/mach-mx5/mx50_arm2.c
index 3024e844f674..204f4c1b58a8 100644
--- a/arch/arm/mach-mx5/mx50_arm2.c
+++ b/arch/arm/mach-mx5/mx50_arm2.c
@@ -1147,6 +1147,7 @@ static void __init mxc_board_init(void)
mxc_register_device(&gpu_device, &z160_version);
mxc_register_device(&mxc_pxp_device, NULL);
mxc_register_device(&mxc_pxp_client_device, NULL);
+ mxc_register_device(&mxc_pxp_v4l2, NULL);
mxc_register_device(&mxc_dvfs_core_device, &dvfs_core_data);
/*
mxc_register_device(&mx53_lpmode_device, NULL);