commit 7c00df82cdb7047c645daacbefad5edaa26d3099
author Linux Build Service Account <lnxbuild@localhost> Sat Jun 01 08:45:07 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 01 08:45:06 2013 -0700
tree b9f8cddac4101f644749d748c0975b0211c7563a
parent 141add6bed51ae51d20b1b89cd638896528c1854
parent 0f2abce8c2fd98dc43774af7ca3efb37e9400799

Merge "msm: camera: kconfig: Add support for csi2.2 header"

drivers/media/platform/msm/camera_v2/Kconfig

diff --git a/drivers/media/platform/msm/camera_v2/Kconfig b/drivers/media/platform/msm/camera_v2/Kconfig
index 52864ae..525a545 100644
--- a/drivers/media/platform/msm/camera_v2/Kconfig
+++ b/drivers/media/platform/msm/camera_v2/Kconfig
@@ -36,6 +36,16 @@
           This config macro is required targets based on 8960,
           8930 and 8064 platforms.
 
+config MSM_CSI22_HEADER
+        bool "Qualcomm MSM CSI 2.2 Header"
+        depends on MSMB_CAMERA
+        ---help---
+          Enable support for CSI drivers to include 2.2
+          header. This header has register macros and its
+          values and bit mask for register configuration bits
+          This config macro is required targets based on 8610
+          platform.
+
 config MSM_CSI30_HEADER
         bool "Qualcomm MSM CSI 3.0 Header"
         depends on MSMB_CAMERA
@@ -82,6 +92,15 @@
           of any CID of CSID can be routed to of of pixel or raw
           data interface in VFE.
 
+config MSM_ISPIF_V1
+        bool "Qualcomm MSM Image Signal Processing interface support"
+        depends on MSMB_CAMERA
+        ---help---
+          Enable support for Image Signal Processing interface module.
+          This module acts as a crossbar between CSID and VFE. Output
+          of any CID of MSM_CSI22_HEADER can be routed to of pixel
+          or raw data interface in VFE.
+
 config S5K3L1YX
 	bool "Sensor S5K3L1YX (BAYER 12M)"
 	depends on MSMB_CAMERA