commit 3be11616591d1bd24633f38d30f309129ce39c9a
author Kevin Chan <ktchan@codeaurora.org> Thu Mar 22 20:05:40 2012 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Apr 12 08:12:09 2012 -0600
tree 7c7d51a027a1c4a27b36d74515817bc010ac708d
parent 53e4d58968bb8babccf7bc32f6cee9e538c51871

msm: camera: prepare msm8x60 camera for V4L2 architecture.

- This change is intended towards unifying camera architecture
  across all msm chipsets.
- This new architecture is V4L2 based and is already supported
  on msm7x27a, msm8960 and apq8064.
- This change prepares msm8x60 camera for this new architecture
  without enabling it at this moment.

Change-Id: I8e1a7f4893fdf873243597be9c29ac829d315cf8
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
Signed-off-by: Ankit Premrajka <ankitp@codeaurora.org>
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
Signed-off-by: Aditya Degwekar <adityad@codeaurora.org>
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>

arch/arm/mach-msm/include/mach/camera.h

diff --git a/arch/arm/mach-msm/include/mach/camera.h b/arch/arm/mach-msm/include/mach/camera.h
index ba038cb..5ee9e1a 100644
--- a/arch/arm/mach-msm/include/mach/camera.h
+++ b/arch/arm/mach-msm/include/mach/camera.h
@@ -200,12 +200,14 @@
 	struct msm_camera_csiphy_params csiphy_params;
 };
 
+#ifndef CONFIG_MSM_CAMERA_V4L2
 #define VFE31_OUTPUT_MODE_PT (0x1 << 0)
 #define VFE31_OUTPUT_MODE_S (0x1 << 1)
 #define VFE31_OUTPUT_MODE_V (0x1 << 2)
 #define VFE31_OUTPUT_MODE_P (0x1 << 3)
 #define VFE31_OUTPUT_MODE_T (0x1 << 4)
 #define VFE31_OUTPUT_MODE_P_ALL_CHNLS (0x1 << 5)
+#endif
 
 #define CSI_EMBED_DATA 0x12
 #define CSI_YUV422_8  0x1E