diff --git a/configs/camera/mot_s5k2l7_chromatix.xml b/configs/camera/mot_s5k2l7_chromatix.xml
new file mode 100644
index 0000000..ca653f2
--- /dev/null
+++ b/configs/camera/mot_s5k2l7_chromatix.xml
@@ -0,0 +1,134 @@
+<!--
+  Copyright (c) 2016 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!--
+CommonChromatixInfo:
+	CommonChromatixInfo is the information about chromatix needed for
+		various use cases.
+	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
+		3A and SW PostProc.
+	Entries in this node are common for all sensor modes.
+
+ResolutionChromatixInfo:
+	ResolutionChromatixInfo is the information about chromatix needed for
+		various use cases.
+	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
+		3A and SW PostProc.
+	Entries in this node are specific to sensor resolution.
+
+ChromatixName:
+	Contains the list of chromatix names for all modules.
+	special_mode_mask:
+		It is the bit mask for special modes, which is used for
+			chromatix selection.
+		Special modes can be any mode that needs a special chromatix.
+		Ex:- scene mode, DZOOM mode, OIS capture mode, flash mode
+		This is applicable for CommonChromatixInfo and
+			ResolutionChromatixInfo.
+		special_mode_mask="0" means none of the special modes are
+			selected.
+	sensor_resolution_index:
+		It is the sensor resolution index for which chromatix libraries
+			will be choosen.
+		It is applicable only in ResolutionChromatixInfo.
+
+ISPCommon :
+	Common tuning library name for ISP
+ISPPreview :
+	Preview tuning library name for ISP
+ISPSnapshot :
+	Snapshot tuning library name for ISP
+CPPCommon :
+	Common tuning library name for CPP
+CPPPreview :
+	Preview tuning library name for CPP
+CPPSnapshot :
+	Snapshot tuning library name for CPP
+CPPLiveshot :
+	Liveshot tuning library name for CPP
+PostProc :
+	Tuning library name for postproc module
+A3Preview :
+	Preview tuning library for 3A
+A3Video :
+	Video tuning library for 3A
+
+Order of Resolution Pick:
+	Assume the current sensor mode is "r" and special mode mask is "s".
+	Chromatix for a module and type is choosen in this order till we find a
+		valid chroamtix file name or else NULL is returned.
+	1) From ResolutionChromatixInfo node for which sensor_resolution_index
+		is "r" and special_mode_mask is "s".
+	2) From CommonChromatixInfo node for which special_mode_mask is "s".
+	3) From ResolutionChromatixInfo node for which sensor_resolution_index
+		is "r" and special_mode_mask is "0".
+	4) From CommonChromatixInfo node for which special_mode_mask is "0".
+	5) NULL is returned if we dont find in any of the above cases.
+
+special_mode_mask values:
+	SENSOR_SPECIAL_MODE_NONE = 0,
+	SENSOR_SPECIAL_MODE_FLASH = 1,
+	SENSOR_SPECIAL_MODE_ZOOM_UPSCALE = 2,
+	SENSOR_SPECIAL_MODE_ZOOM_DOWNSCALE = 4,
+	SENSOR_SPECIAL_MODE_OIS_CAPTURE = 8,
+-->
+
+<ChromatixConfigurationRoot>
+  <CommonChromatixInfo>
+    <ChromatixName special_mode_mask="0">
+      <ISPCommon>mot_s5k2l7_common</ISPCommon>
+      <PostProc>mot_s5k2l7_postproc</PostProc>
+    </ChromatixName>
+    <ChromatixName special_mode_mask="MOT_4K_VIDEO">
+      <ISPVideo>mot_s5k2l7_video_4k</ISPVideo>
+      <CPPVideo>mot_s5k2l7_cpp_video_4k</CPPVideo>
+      <A3Video>mot_s5k2l7_4k_video_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName special_mode_mask="MOT_ALTM_IHDR_VIDEO">
+      <ISPVideo>mot_s5k2l7_ihdr_video</ISPVideo>
+      <A3Video>mot_s5k2l7_ihdr_video_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName special_mode_mask="MOT_4K_IHDR_VIDEO">
+      <ISPVideo>mot_s5k2l7_ihdr_video_4k</ISPVideo>
+      <A3Video>mot_s5k2l7_4k_ihdr_video_3a</A3Video>
+    </ChromatixName>
+  </CommonChromatixInfo>
+  <ResolutionChromatixInfo>
+    <ChromatixName sensor_resolution_index="0" special_mode_mask="0">
+      <ISPPreview>mot_s5k2l7_snapshot</ISPPreview>
+      <ISPSnapshot>mot_s5k2l7_snapshot</ISPSnapshot>
+      <ISPVideo>mot_s5k2l7_default_video</ISPVideo>
+      <CPPPreview>mot_s5k2l7_cpp_preview</CPPPreview>
+      <CPPSnapshot>mot_s5k2l7_cpp_snapshot</CPPSnapshot>
+      <CPPVideo>mot_s5k2l7_cpp_video</CPPVideo>
+      <CPPLiveshot>mot_s5k2l7_cpp_liveshot</CPPLiveshot>
+      <A3Preview>mot_s5k2l7_fullsize_preview_3a</A3Preview>
+      <A3Video>mot_s5k2l7_fullsize_video_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName sensor_resolution_index="1" special_mode_mask="0">
+      <ISPPreview>mot_s5k2l7_hfr_60</ISPPreview>
+      <ISPSnapshot>mot_s5k2l7_hfr_60</ISPSnapshot>
+      <ISPVideo>mot_s5k2l7_hfr_60</ISPVideo>
+      <CPPPreview>mot_s5k2l7_cpp_hfr_60</CPPPreview>
+      <CPPSnapshot>mot_s5k2l7_cpp_hfr_60</CPPSnapshot>
+      <CPPVideo>mot_s5k2l7_cpp_hfr_60</CPPVideo>
+      <CPPLiveshot>mot_s5k2l7_cpp_hfr_60</CPPLiveshot>
+      <A3Preview>mot_s5k2l7_hfr_60_3a</A3Preview>
+      <A3Video>mot_s5k2l7_hfr_60_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName sensor_resolution_index="2" special_mode_mask="0">
+      <ISPPreview>mot_s5k2l7_hfr_120</ISPPreview>
+      <ISPSnapshot>mot_s5k2l7_hfr_120</ISPSnapshot>
+      <ISPVideo>mot_s5k2l7_hfr_120</ISPVideo>
+      <CPPPreview>mot_s5k2l7_cpp_hfr_120</CPPPreview>
+      <CPPSnapshot>mot_s5k2l7_cpp_hfr_120</CPPSnapshot>
+      <CPPVideo>mot_s5k2l7_cpp_hfr_120</CPPVideo>
+      <CPPLiveshot>mot_s5k2l7_cpp_hfr_120</CPPLiveshot>
+      <A3Preview>mot_s5k2l7_hfr_120_3a</A3Preview>
+      <A3Video>mot_s5k2l7_hfr_120_3a</A3Video>
+    </ChromatixName>
+  </ResolutionChromatixInfo>
+</ChromatixConfigurationRoot>
diff --git a/configs/camera/mot_s5k2l7sa_chromatix.xml b/configs/camera/mot_s5k2l7sa_chromatix.xml
new file mode 100644
index 0000000..e1d4d8e
--- /dev/null
+++ b/configs/camera/mot_s5k2l7sa_chromatix.xml
@@ -0,0 +1,134 @@
+<!--
+  Copyright (c) 2016 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!--
+CommonChromatixInfo:
+	CommonChromatixInfo is the information about chromatix needed for
+		various use cases.
+	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
+		3A and SW PostProc.
+	Entries in this node are common for all sensor modes.
+
+ResolutionChromatixInfo:
+	ResolutionChromatixInfo is the information about chromatix needed for
+		various use cases.
+	Ex:- Preview, Snapshot, ZSL, HFR, HDR, Video, Liveshot for ISP, CPP,
+		3A and SW PostProc.
+	Entries in this node are specific to sensor resolution.
+
+ChromatixName:
+	Contains the list of chromatix names for all modules.
+	special_mode_mask:
+		It is the bit mask for special modes, which is used for
+			chromatix selection.
+		Special modes can be any mode that needs a special chromatix.
+		Ex:- scene mode, DZOOM mode, OIS capture mode, flash mode
+		This is applicable for CommonChromatixInfo and
+			ResolutionChromatixInfo.
+		special_mode_mask="0" means none of the special modes are
+			selected.
+	sensor_resolution_index:
+		It is the sensor resolution index for which chromatix libraries
+			will be choosen.
+		It is applicable only in ResolutionChromatixInfo.
+
+ISPCommon :
+	Common tuning library name for ISP
+ISPPreview :
+	Preview tuning library name for ISP
+ISPSnapshot :
+	Snapshot tuning library name for ISP
+CPPCommon :
+	Common tuning library name for CPP
+CPPPreview :
+	Preview tuning library name for CPP
+CPPSnapshot :
+	Snapshot tuning library name for CPP
+CPPLiveshot :
+	Liveshot tuning library name for CPP
+PostProc :
+	Tuning library name for postproc module
+A3Preview :
+	Preview tuning library for 3A
+A3Video :
+	Video tuning library for 3A
+
+Order of Resolution Pick:
+	Assume the current sensor mode is "r" and special mode mask is "s".
+	Chromatix for a module and type is choosen in this order till we find a
+		valid chroamtix file name or else NULL is returned.
+	1) From ResolutionChromatixInfo node for which sensor_resolution_index
+		is "r" and special_mode_mask is "s".
+	2) From CommonChromatixInfo node for which special_mode_mask is "s".
+	3) From ResolutionChromatixInfo node for which sensor_resolution_index
+		is "r" and special_mode_mask is "0".
+	4) From CommonChromatixInfo node for which special_mode_mask is "0".
+	5) NULL is returned if we dont find in any of the above cases.
+
+special_mode_mask values:
+	SENSOR_SPECIAL_MODE_NONE = 0,
+	SENSOR_SPECIAL_MODE_FLASH = 1,
+	SENSOR_SPECIAL_MODE_ZOOM_UPSCALE = 2,
+	SENSOR_SPECIAL_MODE_ZOOM_DOWNSCALE = 4,
+	SENSOR_SPECIAL_MODE_OIS_CAPTURE = 8,
+-->
+
+<ChromatixConfigurationRoot>
+  <CommonChromatixInfo>
+    <ChromatixName special_mode_mask="0">
+      <ISPCommon>mot_s5k2l7sa_common</ISPCommon>
+      <PostProc>mot_s5k2l7sa_postproc</PostProc>
+    </ChromatixName>
+    <ChromatixName special_mode_mask="MOT_4K_VIDEO">
+      <ISPVideo>mot_s5k2l7sa_video_4k</ISPVideo>
+      <CPPVideo>mot_s5k2l7sa_cpp_video_4k</CPPVideo>
+      <A3Video>mot_s5k2l7sa_4k_video_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName special_mode_mask="MOT_ALTM_IHDR_VIDEO">
+      <ISPVideo>mot_s5k2l7sa_ihdr_video</ISPVideo>
+      <A3Video>mot_s5k2l7sa_ihdr_video_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName special_mode_mask="MOT_4K_IHDR_VIDEO">
+      <ISPVideo>mot_s5k2l7sa_ihdr_video_4k</ISPVideo>
+      <A3Video>mot_s5k2l7sa_4k_ihdr_video_3a</A3Video>
+    </ChromatixName>
+  </CommonChromatixInfo>
+  <ResolutionChromatixInfo>
+    <ChromatixName sensor_resolution_index="0" special_mode_mask="0">
+      <ISPPreview>mot_s5k2l7sa_snapshot</ISPPreview>
+      <ISPSnapshot>mot_s5k2l7sa_snapshot</ISPSnapshot>
+      <ISPVideo>mot_s5k2l7sa_default_video</ISPVideo>
+      <CPPPreview>mot_s5k2l7sa_cpp_preview</CPPPreview>
+      <CPPSnapshot>mot_s5k2l7sa_cpp_snapshot</CPPSnapshot>
+      <CPPVideo>mot_s5k2l7sa_cpp_video</CPPVideo>
+      <CPPLiveshot>mot_s5k2l7sa_cpp_liveshot</CPPLiveshot>
+      <A3Preview>mot_s5k2l7sa_fullsize_preview_3a</A3Preview>
+      <A3Video>mot_s5k2l7sa_fullsize_video_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName sensor_resolution_index="1" special_mode_mask="0">
+      <ISPPreview>mot_s5k2l7sa_hfr_60</ISPPreview>
+      <ISPSnapshot>mot_s5k2l7sa_hfr_60</ISPSnapshot>
+      <ISPVideo>mot_s5k2l7sa_hfr_60</ISPVideo>
+      <CPPPreview>mot_s5k2l7sa_cpp_hfr_60</CPPPreview>
+      <CPPSnapshot>mot_s5k2l7sa_cpp_hfr_60</CPPSnapshot>
+      <CPPVideo>mot_s5k2l7sa_cpp_hfr_60</CPPVideo>
+      <CPPLiveshot>mot_s5k2l7sa_cpp_hfr_60</CPPLiveshot>
+      <A3Preview>mot_s5k2l7sa_hfr_60_3a</A3Preview>
+      <A3Video>mot_s5k2l7sa_hfr_60_3a</A3Video>
+    </ChromatixName>
+    <ChromatixName sensor_resolution_index="2" special_mode_mask="0">
+      <ISPPreview>mot_s5k2l7sa_hfr_120</ISPPreview>
+      <ISPSnapshot>mot_s5k2l7sa_hfr_120</ISPSnapshot>
+      <ISPVideo>mot_s5k2l7sa_hfr_120</ISPVideo>
+      <CPPPreview>mot_s5k2l7sa_cpp_hfr_120</CPPPreview>
+      <CPPSnapshot>mot_s5k2l7sa_cpp_hfr_120</CPPSnapshot>
+      <CPPVideo>mot_s5k2l7sa_cpp_hfr_120</CPPVideo>
+      <CPPLiveshot>mot_s5k2l7sa_cpp_hfr_120</CPPLiveshot>
+      <A3Preview>mot_s5k2l7sa_hfr_120_3a</A3Preview>
+      <A3Video>mot_s5k2l7sa_hfr_120_3a</A3Video>
+    </ChromatixName>
+  </ResolutionChromatixInfo>
+</ChromatixConfigurationRoot>
diff --git a/configs/camera/msm8953_mot_potter_camera.xml b/configs/camera/msm8953_mot_potter_camera.xml
index 15461fa..99efd22 100644
--- a/configs/camera/msm8953_mot_potter_camera.xml
+++ b/configs/camera/msm8953_mot_potter_camera.xml
@@ -85,7 +85,7 @@ LensInfo : Information of the lens present in the module.
 
 <CameraConfigurationRoot>
   <CameraModuleConfig>
-    <CameraId>1</CameraId>
+    <CameraId>0</CameraId>
     <SensorName>mot_imx362</SensorName>
     <EepromName>imx362</EepromName>
     <ActuatorName>mot_ak7371</ActuatorName>
@@ -109,8 +109,58 @@ LensInfo : Information of the lens present in the module.
       <MinFocusDistance>0.1</MinFocusDistance>
     </LensInfo>
   </CameraModuleConfig>
+  <CameraModuleConfig>
+    <CameraId>1</CameraId>
+    <SensorName>mot_s5k2l7</SensorName>
+    <EepromName>s5k2l7</EepromName>
+    <ActuatorName>mot_ak7371</ActuatorName>
+    <FlashName>pmic</FlashName>
+    <ChromatixName>mot_s5k2l7_chromatix</ChromatixName>
+    <ModesSupported>1</ModesSupported>
+    <Position>BACK</Position>
+    <MountAngle>90</MountAngle>
+    <CSIInfo>
+      <CSIDCore>0</CSIDCore>
+      <LaneMask>0x1F</LaneMask>
+      <LaneAssign>0x4320</LaneAssign>
+      <ComboMode>0</ComboMode>
+    </CSIInfo>
+    <LensInfo>
+      <FocalLength>4.28</FocalLength>
+      <FNumber>1.7</FNumber>
+      <TotalFocusDistance>0.187</TotalFocusDistance>
+      <HorizontalViewAngle>65.0</HorizontalViewAngle>
+      <VerticalViewAngle>51.0</VerticalViewAngle>
+      <MinFocusDistance>0.1</MinFocusDistance>
+    </LensInfo>
+  </CameraModuleConfig>
   <CameraModuleConfig>
     <CameraId>2</CameraId>
+    <SensorName>mot_s5k2l7sa</SensorName>
+    <EepromName>s5k2l7</EepromName>
+    <ActuatorName>mot_ak7371</ActuatorName>
+    <FlashName>pmic</FlashName>
+    <ChromatixName>mot_s5k2l7sa_chromatix</ChromatixName>
+    <ModesSupported>1</ModesSupported>
+    <Position>BACK</Position>
+    <MountAngle>90</MountAngle>
+    <CSIInfo>
+      <CSIDCore>0</CSIDCore>
+      <LaneMask>0x1F</LaneMask>
+      <LaneAssign>0x4320</LaneAssign>
+      <ComboMode>0</ComboMode>
+    </CSIInfo>
+    <LensInfo>
+      <FocalLength>4.28</FocalLength>
+      <FNumber>1.7</FNumber>
+      <TotalFocusDistance>0.187</TotalFocusDistance>
+      <HorizontalViewAngle>65.0</HorizontalViewAngle>
+      <VerticalViewAngle>51.0</VerticalViewAngle>
+      <MinFocusDistance>0.1</MinFocusDistance>
+    </LensInfo>
+  </CameraModuleConfig>
+  <CameraModuleConfig>
+    <CameraId>3</CameraId>
     <SensorName>mot_ov5695</SensorName>
     <EepromName>ov5695</EepromName>
     <ChromatixName>mot_ov5695_chromatix</ChromatixName>
diff --git a/device.mk b/device.mk
index cdcc264..43b4082 100644
--- a/device.mk
+++ b/device.mk
@@ -104,6 +104,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/camera/msm8953_mot_potter_camera.xml:system/etc/camera/msm8953_mot_potter_camera.xml \
     $(LOCAL_PATH)/configs/camera/mot_ov5695_chromatix.xml:system/etc/camera/mot_ov5695_chromatix.xml \
     $(LOCAL_PATH)/configs/camera/mot_imx362_chromatix.xml:system/etc/camera/mot_imx362_chromatix.xml \
+    $(LOCAL_PATH)/configs/camera/mot_s5k2l7_chromatix.xml:system/etc/camera/mot_s5k2l7_chromatix.xml \
+    $(LOCAL_PATH)/configs/camera/mot_s5k2l7sa_chromatix.xml:system/etc/camera/mot_s5k2l7sa_chromatix.xml \
     $(LOCAL_PATH)/configs/camera/vfwconfig.json:system/etc/camera/vfwconfig.json
 
 PRODUCT_COPY_FILES += \