diff --git a/BoardConfig.mk b/BoardConfig.mk
index 67f3ceb..da2fa11 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -37,6 +37,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 BOARD_CAMERA_SENSORS := s5k5e2_olq5f19 s5k3m2_olqba20
 TARGET_USE_VENDOR_CAMERA_EXT := true
 USE_DEVICE_SPECIFIC_CAMERA := true
+TARGET_USES_AOSP := true
 
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
@@ -45,7 +46,7 @@ TARGET_HW_DISK_ENCRYPTION := true
 COMMON_GLOBAL_CFLAGS += -DNO_SECURE_DISCARD
 
 # GPS
-TARGET_GPS_HAL_PATH := $(DEVICE_PATH)/gps
+USE_DEVICE_SPECIFIC_GPS := true
 TARGET_NO_RPC := true
 
 # Lights
@@ -61,7 +62,6 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612224
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 13295385600
 
 # Recovery
-TARGET_OTA_ASSERT_DEVICE := crackling,vixen
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 
 # Wifi - EAP-SIM
diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk
index c03b549..257d8f5 100644
--- a/camera/QCamera2/HAL/Android.mk
+++ b/camera/QCamera2/HAL/Android.mk
@@ -24,6 +24,11 @@ LOCAL_CFLAGS = -Wall -Wextra -Werror
 #ifeq ($(TARGET_USE_VENDOR_CAMERA_EXT),true)
 #LOCAL_CFLAGS += -DUSE_VENDOR_CAMERA_EXT
 #endif
+
+ifeq ($(TARGET_USES_AOSP),true)
+LOCAL_CFLAGS += -DVANILLA_HAL
+endif
+
 ifneq ($(call is-platform-sdk-version-at-least,18),true)
 LOCAL_CFLAGS += -DUSE_JB_MR1
 endif
@@ -73,4 +78,6 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
+ifeq ($(TARGET_USES_AOSP),false)
 include $(LOCAL_PATH)/test/Android.mk
+endif
diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp
index f433396..2cd4624 100755
--- a/camera/QCamera2/HAL/QCamera2HWI.cpp
+++ b/camera/QCamera2/HAL/QCamera2HWI.cpp
@@ -3568,6 +3568,7 @@ int QCamera2HardwareInterface::sendCommand(int32_t command,
     int rc = NO_ERROR;
 
     switch (command) {
+#ifndef VANILLA_HAL
     case CAMERA_CMD_LONGSHOT_ON:
         arg1 = 0;
         // Longshot can only be enabled when image capture
@@ -3634,13 +3635,16 @@ int QCamera2HardwareInterface::sendCommand(int32_t command,
         CDBG_HIGH("%s: Histogram -> %s", __func__,
               mParameters.isHistogramEnabled() ? "Enabled" : "Disabled");
         break;
+#endif
     case CAMERA_CMD_START_FACE_DETECTION:
     case CAMERA_CMD_STOP_FACE_DETECTION:
         rc = setFaceDetection(command == CAMERA_CMD_START_FACE_DETECTION? true : false);
         CDBG_HIGH("%s: FaceDetection -> %s", __func__,
               mParameters.isFaceDetectionEnabled() ? "Enabled" : "Disabled");
         break;
+#ifndef VANILLA_HAL
     case CAMERA_CMD_HISTOGRAM_SEND_DATA:
+#endif
     default:
         rc = NO_ERROR;
         break;
@@ -4175,6 +4179,8 @@ int32_t QCamera2HardwareInterface::processHDRData(cam_asd_hdr_scene_data_t hdr_s
 {
     int rc = NO_ERROR;
 
+#ifndef VANILLA_HAL
+
     if (hdr_scene.is_hdr_scene &&
       (hdr_scene.hdr_confidence > HDR_CONFIDENCE_THRESHOLD) &&
       mParameters.isAutoHDREnabled()) {
@@ -4232,6 +4238,7 @@ int32_t QCamera2HardwareInterface::processHDRData(cam_asd_hdr_scene_data_t hdr_s
           hdr_scene.is_hdr_scene,
           hdr_scene.hdr_confidence);
 
+#endif
   return rc;
 }
 
@@ -4294,6 +4301,8 @@ int32_t QCamera2HardwareInterface::processPrepSnapshotDoneEvent(
  *==========================================================================*/
 int32_t QCamera2HardwareInterface::processASDUpdate(cam_auto_scene_t scene)
 {
+
+#ifndef VANILLA_HAL
     //set ASD parameter
     mParameters.set(QCameraParameters::KEY_SELECTED_AUTO_SCENE, mParameters.getASDStateString(scene));
 
@@ -4333,6 +4342,7 @@ int32_t QCamera2HardwareInterface::processASDUpdate(cam_auto_scene_t scene)
         ALOGE("%s: fail sending notification", __func__);
         asdBuffer->release(asdBuffer);
     }
+#endif
     return NO_ERROR;
 
 }
@@ -5544,15 +5554,19 @@ int32_t QCamera2HardwareInterface::preparePreview()
         if(recordingHint) {
             //stop face detection,longshot,etc if turned ON in Camera mode
             int32_t arg; //dummy arg
+#ifndef VANILLA_HAL
             if (isLongshotEnabled()) {
                 sendCommand(CAMERA_CMD_LONGSHOT_OFF, arg, arg);
             }
+#endif
             if (mParameters.isFaceDetectionEnabled()) {
                 sendCommand(CAMERA_CMD_STOP_FACE_DETECTION, arg, arg);
             }
+#ifndef VANILLA_HAL
             if (mParameters.isHistogramEnabled()) {
                 sendCommand(CAMERA_CMD_HISTOGRAM_OFF, arg, arg);
             }
+#endif
 
             cam_dimension_t videoSize;
             mParameters.getVideoSize(&videoSize.width, &videoSize.height);
@@ -5693,7 +5707,11 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
     if ((NULL == mDataCb) ||
         (fd_type == QCAMERA_FD_PREVIEW && (!msgTypeEnabled(CAMERA_MSG_PREVIEW_METADATA) ||
         (!needPreviewFDCallback(fd_data->num_faces_detected)))) ||
+#ifndef VANILLA_HAL
         (fd_type == QCAMERA_FD_SNAPSHOT && !msgTypeEnabled(CAMERA_MSG_META_DATA))
+#else
+        (fd_type == QCAMERA_FD_SNAPSHOT)
+#endif
         ) {
         CDBG_HIGH("%s: metadata msgtype not enabled, no ops here", __func__);
         return NO_ERROR;
@@ -5716,6 +5734,7 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
         faceResultSize = sizeof(camera_frame_metadata_t);
         faceResultSize += sizeof(camera_face_t) * MAX_ROI;
     }else if(fd_type == QCAMERA_FD_SNAPSHOT){
+#ifndef VANILLA_HAL
         // fd for snapshot frames
         //check if face is detected in this frame
         if(fd_data->num_faces_detected > 0){
@@ -5725,6 +5744,7 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
             //no face
             data_len = 0;
         }
+#endif
         faceResultSize = 1 *sizeof(int)    //meta data type
                        + 1 *sizeof(int)    // meta data len
                        + data_len;         //data
@@ -5747,6 +5767,7 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
         faceData = pFaceResult;
         mNumPreviewFaces = fd_data->num_faces_detected;
     }else if(fd_type == QCAMERA_FD_SNAPSHOT){
+#ifndef VANILLA_HAL
         //need fill meta type and meta data len first
         int *data_header = (int* )pFaceResult;
         data_header[0] = CAMERA_META_DATA_FD;
@@ -5771,6 +5792,7 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
         }
 
         faceData = pFaceResult + 2 *sizeof(int); //skip two int length
+#endif
     }
 
     camera_frame_metadata_t *roiData = (camera_frame_metadata_t * ) faceData;
@@ -5825,6 +5847,7 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
             mFaceRect.right = fd_data->faces[i].face_boundary.width+mFaceRect.left;
             mFaceRect.bottom = fd_data->faces[i].face_boundary.height+mFaceRect.top;
 #endif
+#ifndef VANILLA_HAL
             faces[i].smile_degree = fd_data->faces[i].smile_degree;
             faces[i].smile_score = fd_data->faces[i].smile_confidence;
             faces[i].blink_detected = fd_data->faces[i].blink_detected;
@@ -5840,6 +5863,7 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
             faces[i].reye_blink = fd_data->faces[i].right_blink;
             faces[i].left_right_gaze = fd_data->faces[i].left_right_gaze;
             faces[i].top_bottom_gaze = fd_data->faces[i].top_bottom_gaze;
+#endif
 
         }
     }
@@ -5853,9 +5877,12 @@ int32_t QCamera2HardwareInterface::processFaceDetectionResult(cam_face_detection
     cbArg.cb_type = QCAMERA_DATA_CALLBACK;
     if(fd_type == QCAMERA_FD_PREVIEW){
         cbArg.msg_type = CAMERA_MSG_PREVIEW_METADATA;
-    }else if(fd_type == QCAMERA_FD_SNAPSHOT){
+    }
+#ifndef VANILLA_HAL
+    else if(fd_type == QCAMERA_FD_SNAPSHOT){
         cbArg.msg_type = CAMERA_MSG_META_DATA;
     }
+#endif
     cbArg.data = faceResultBuffer;
     cbArg.metadata = roiData;
     cbArg.user_data = faceResultBuffer;
@@ -5931,6 +5958,7 @@ void QCamera2HardwareInterface::returnStreamBuffer(void *data,
  *==========================================================================*/
 int32_t QCamera2HardwareInterface::processHistogramStats(cam_hist_stats_t &stats_data)
 {
+#ifndef VANILLA_HAL
     if (!mParameters.isHistogramEnabled()) {
         CDBG("%s: Histogram not enabled, no ops here", __func__);
         return NO_ERROR;
@@ -5975,6 +6003,9 @@ int32_t QCamera2HardwareInterface::processHistogramStats(cam_hist_stats_t &stats
         histBuffer->release(histBuffer);
     }
     return NO_ERROR;
+#else
+    return NO_ERROR;
+#endif
 }
 
 /*===========================================================================
diff --git a/camera/QCamera2/HAL/QCamera2Hal.cpp b/camera/QCamera2/HAL/QCamera2Hal.cpp
index 7a02d5d..3faf88e 100644
--- a/camera/QCamera2/HAL/QCamera2Hal.cpp
+++ b/camera/QCamera2/HAL/QCamera2Hal.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundataion. All rights reserved.
+/* Copyright (c) 2012-2015, The Linux Foundataion. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -52,6 +52,8 @@ camera_module_t HAL_MODULE_INFO_SYM = {
     get_vendor_tag_ops: NULL,
 #ifndef USE_KK_CODE
     open_legacy: NULL,
+    set_torch_mode: NULL,
+    init: NULL,
 #endif
     reserved:  {0}
 //#endif
diff --git a/camera/QCamera2/HAL/QCameraStateMachine.cpp b/camera/QCamera2/HAL/QCameraStateMachine.cpp
index 4272f8e..e477ab1 100644
--- a/camera/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/camera/QCamera2/HAL/QCameraStateMachine.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, The Linux Foundataion. All rights reserved.
+/* Copyright (c) 2012-2015, The Linux Foundataion. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
@@ -1183,6 +1183,7 @@ int32_t QCameraStateMachine::procEvtPreviewingState(qcamera_sm_evt_enum_t evt,
             rc = m_parent->sendCommand(cmd_payload->cmd,
                                        cmd_payload->arg1,
                                        cmd_payload->arg2);
+#ifndef VANILLA_HAL
             if (CAMERA_CMD_LONGSHOT_ON == cmd_payload->cmd) {
                 if (QCAMERA_SM_EVT_RESTART_PERVIEW == cmd_payload->arg1) {
                     m_parent->stopPreview();
@@ -1198,6 +1199,7 @@ int32_t QCameraStateMachine::procEvtPreviewingState(qcamera_sm_evt_enum_t evt,
                     }
                 }
             }
+#endif
             result.status = rc;
             result.request_api = evt;
             result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1651,10 +1653,12 @@ int32_t QCameraStateMachine::procEvtPicTakingState(qcamera_sm_evt_enum_t evt,
             rc = m_parent->sendCommand(cmd_payload->cmd,
                                        cmd_payload->arg1,
                                        cmd_payload->arg2);
+#ifndef VANILLA_HAL
             if ( CAMERA_CMD_LONGSHOT_OFF == cmd_payload->cmd ) {
                 // move state to previewing state
                 m_state = QCAMERA_SM_STATE_PREVIEWING;
             }
+#endif
             result.status = rc;
             result.request_api = evt;
             result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2732,10 +2736,12 @@ int32_t QCameraStateMachine::procEvtPreviewPicTakingState(qcamera_sm_evt_enum_t
             rc = m_parent->sendCommand(cmd_payload->cmd,
                                        cmd_payload->arg1,
                                        cmd_payload->arg2);
+#ifndef VANILLA_HAL
             if ( CAMERA_CMD_LONGSHOT_OFF == cmd_payload->cmd ) {
                 // move state to previewing state
                 m_state = QCAMERA_SM_STATE_PREVIEWING;
             }
+#endif
             result.status = rc;
             result.request_api = evt;
             result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
diff --git a/camera/QCamera2/stack/common/cam_list.h b/camera/QCamera2/stack/common/cam_list.h
index 36379af..7f88d86 100755
--- a/camera/QCamera2/stack/common/cam_list.h
+++ b/camera/QCamera2/stack/common/cam_list.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -34,6 +34,8 @@
 #define __CAMLIST_H
 
 #include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
 
 #define member_of(ptr, type, member) ({ \
   const typeof(((type *)0)->member) *__mptr = (ptr); \
diff --git a/camera/QCamera2/stack/common/cam_types.h b/camera/QCamera2/stack/common/cam_types.h
index 082f5bb..270f869 100644
--- a/camera/QCamera2/stack/common/cam_types.h
+++ b/camera/QCamera2/stack/common/cam_types.h
@@ -34,6 +34,8 @@
 #include <pthread.h>
 #include <inttypes.h>
 #include <media/msmb_camera.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define CAM_MAX_NUM_BUFS_PER_STREAM  (24)
 #define MAX_METADATA_PAYLOAD_SIZE    (1024)
diff --git a/camera/mm-image-codec/qomx_core/qomx_core.h b/camera/mm-image-codec/qomx_core/qomx_core.h
index f59f7cf..1049742 100644
--- a/camera/mm-image-codec/qomx_core/qomx_core.h
+++ b/camera/mm-image-codec/qomx_core/qomx_core.h
@@ -1,4 +1,4 @@
-/*Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/*Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -34,6 +34,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 #include <pthread.h>
 #include <dlfcn.h>
 #include <stdlib.h>
+#include <string.h>
 #include "OMX_Component.h"
 
 #define TRUE 1
diff --git a/configs/data/dsi_config.xml b/configs/data/dsi_config.xml
index 49d21f4..636de1d 100644
--- a/configs/data/dsi_config.xml
+++ b/configs/data/dsi_config.xml
@@ -1,11 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      DSI Module configuration XML file
-     Copyright (c) 2013 Qualcomm Technologies, Inc.  All Rights Reserved.
+     Copyright (c) 2013, 2015 Qualcomm Technologies, Inc.  All Rights Reserved.
      Qualcomm Technologies Proprietary and Confidential.
 -->
 
 <list name="dsi_config">
+
+   <!-- Configuration for legacy MSM targets -->
+   <listitem name="msm">
+
+     <data name="qos_enabled" type="int"> 0 </data>
+     <data name="rmnet_data_enabled" type="int"> 0 </data>
+     <data name="phys_net_dev" type="string"> rmnet0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 0 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet0 </data>
+       <data type="string"> rmnet1 </data>
+       <data type="string"> rmnet2 </data>
+       <data type="string"> rmnet3 </data>
+       <data type="string"> rmnet4 </data>
+       <data type="string"> rmnet5 </data>
+       <data type="string"> rmnet6 </data>
+       <data type="string"> rmnet7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet0 </data>
+       <data type="string"> rmnet1 </data>
+       <data type="string"> rmnet2 </data>
+       <data type="string"> rmnet3 </data>
+       <data type="string"> rmnet4 </data>
+       <data type="string"> rmnet5 </data>
+       <data type="string"> rmnet6 </data>
+       <data type="string"> rmnet7 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for fusion4 -->
+   <listitem name="mdm">
+
+     <data name="qos_enabled" type="int"> 0 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_usb0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 0 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet_usb0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_usb0 </data>
+       <data type="string"> rmnet_usb1 </data>
+       <data type="string"> rmnet_usb2 </data>
+       <data type="string"> rmnet_usb3 </data>
+       <data type="string"> rmnet_usb4 </data>
+       <data type="string"> rmnet_usb5 </data>
+       <data type="string"> rmnet_usb6 </data>
+       <data type="string"> rmnet_usb7 </data>
+     </list>
+   </listitem>
+
    <!-- Configuration for fusion4.5 PCIe -->
    <listitem name="fusion4_5_pcie">
 
@@ -29,14 +98,14 @@
      </list>
 
      <list name="control_port_names">
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
-       <data type="string"> rmnet_mhi0 </data>
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
      </list>
    </listitem>
 
@@ -63,14 +132,14 @@
      </list>
 
      <list name="control_port_names">
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
      </list>
    </listitem>
 
@@ -96,14 +165,14 @@
      </list>
 
      <list name="control_port_names">
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
      </list>
    </listitem>
 
@@ -129,14 +198,14 @@
      </list>
 
      <list name="control_port_names">
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
      </list>
    </listitem>
 
@@ -163,15 +232,283 @@
      </list>
 
      <list name="control_port_names">
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
-       <data type="string"> rmnet0 </data>
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
      </list>
    </listitem>
+
+   <!-- Configuration for 9X40/9X45 LE (Tesla)  -->
+   <listitem name="tesla">
+     <data name="qos_enabled" type="int"> 0 </data>
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for MSM8952/MSM8956  -->
+   <listitem name="tabasco">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+   <!-- Configuration for MSM8976 -->
+   <listitem name="Eldarion">
+
+	 <data name="qos_enabled" type="int"> 1 </data>
+	 <data name="rmnet_data_enabled" type="int"> 1 </data>
+	 <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+	 <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+	 <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+	 <data name="num_dsi_handles" type="int"> 8 </data>
+	 <list name="device_names">
+	   <data type="string"> rmnet_data0 </data>
+	   <data type="string"> rmnet_data1 </data>
+	   <data type="string"> rmnet_data2 </data>
+	   <data type="string"> rmnet_data3 </data>
+	   <data type="string"> rmnet_data4 </data>
+	   <data type="string"> rmnet_data5 </data>
+	   <data type="string"> rmnet_data6 </data>
+	   <data type="string"> rmnet_data7 </data>
+	 </list>
+
+	 <list name="control_port_names">
+	   <data type="string"> rmnet_data0 </data>
+	   <data type="string"> rmnet_data1 </data>
+	   <data type="string"> rmnet_data2 </data>
+	   <data type="string"> rmnet_data3 </data>
+	   <data type="string"> rmnet_data4 </data>
+	   <data type="string"> rmnet_data5 </data>
+	   <data type="string"> rmnet_data6 </data>
+	   <data type="string"> rmnet_data7 </data>
+	 </list>
+
+   </listitem>
+   <!-- Configuration for MSM8996  -->
+   <listitem name="msm8996">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+
+  <!-- Configuration for Fusion 8084 + 9x45 PCIe -->
+  <listitem name="fusion_8084_9x45_pcie">
+    <data name="qos_enabled" type="int"> 0 </data>
+    <data name="rmnet_data_enabled" type="int"> 1 </data>
+    <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
+
+    <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+    <data name="single_qmux_channel_name" type="string"> rmnet_mhi0 </data>
+
+    <data name="num_dsi_handles" type="int"> 8 </data>
+    <list name="device_names">
+      <data type="string"> rmnet_data0 </data>
+      <data type="string"> rmnet_data1 </data>
+      <data type="string"> rmnet_data2 </data>
+      <data type="string"> rmnet_data3 </data>
+      <data type="string"> rmnet_data4 </data>
+      <data type="string"> rmnet_data5 </data>
+      <data type="string"> rmnet_data6 </data>
+      <data type="string"> rmnet_data7 </data>
+    </list>
+
+    <list name="control_port_names">
+      <data type="string"> rmnet_data0 </data>
+      <data type="string"> rmnet_data1 </data>
+      <data type="string"> rmnet_data2 </data>
+      <data type="string"> rmnet_data3 </data>
+      <data type="string"> rmnet_data4 </data>
+      <data type="string"> rmnet_data5 </data>
+      <data type="string"> rmnet_data6 </data>
+      <data type="string"> rmnet_data7 </data>
+    </list>
+  </listitem>
+
+   <!-- Configuration for 9X50/9X55 LE (Atlas)  -->
+   <listitem name="atlas">
+     <data name="qos_enabled" type="int"> 0 </data>
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for Fusion 8096 + 9x55 PCIe -->
+   <listitem name="fusion_8096_9x55_pcie">
+     <data name="qos_enabled" type="int"> 0 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet_mhi0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+   <!-- Configuration for lykan -->
+   <listitem name="lykan">
+     <data name="qos_enabled" type="int"> 0 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet0 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 8 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+
 </list>
 
diff --git a/configs/data/netmgr_config.xml b/configs/data/netmgr_config.xml
index 2d2839c..968c664 100644
--- a/configs/data/netmgr_config.xml
+++ b/configs/data/netmgr_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Netmgr Module configuration XML file
-     Copyright (c) 2013 Qualcomm Technologies, Inc.  All Rights Reserved.
+     Copyright (c) 2013, 2015 Qualcomm Technologies, Inc.  All Rights Reserved.
      Qualcomm Technologies Proprietary and Confidential.
 -->
 
@@ -9,11 +9,176 @@
 <!-- QMI configuration -->
 <list name="netmgr_config">
 
+   <!-- Legacy MSM targets -->
+   <listitem name = "msm">
+
+      <data name="qmi_dpm_enabled" type="int"> 0 </data>
+      <data name="wda_data_format_enabled" type="int"> 0 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 0 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> SMDCTL0 </data>
+
+      <data name="rmnet_data_enabled" type="int"> 0 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 0 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 0 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet0 </data>
+
+      <data name="pnd_rps_mask" type="int"> 0 </data>
+      <data name="netdev_budget" type="int"> 0 </data>
+
+      <data name="low_latency_filters" type="int"> 0 </data>
+
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 8 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet0 </data>
+         <data type="string"> rmnet1 </data>
+         <data type="string"> rmnet2 </data>
+         <data type="string"> rmnet3 </data>
+         <data type="string"> rmnet4 </data>
+         <data type="string"> rmnet5 </data>
+         <data type="string"> rmnet6 </data>
+         <data type="string"> rmnet7 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 8 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet0 </data>
+         <data type="string"> rmnet1 </data>
+         <data type="string"> rmnet2 </data>
+         <data type="string"> rmnet3 </data>
+         <data type="string"> rmnet4 </data>
+         <data type="string"> rmnet5 </data>
+         <data type="string"> rmnet6 </data>
+         <data type="string"> rmnet7 </data>
+      </list>
+
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+         <data type="string"> rev_rmnet0 </data>
+         <data type="string"> rev_rmnet1 </data>
+         <data type="string"> rev_rmnet2 </data>
+         <data type="string"> rev_rmnet3 </data>
+         <data type="string"> rev_rmnet4 </data>
+         <data type="string"> rev_rmnet5 </data>
+         <data type="string"> rev_rmnet6 </data>
+         <data type="string"> rev_rmnet7 </data>
+         <data type="string"> rev_rmnet8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> rev_rmnet0 </data>
+        <data type="string"> rev_rmnet1 </data>
+        <data type="string"> rev_rmnet2 </data>
+        <data type="string"> rev_rmnet3 </data>
+        <data type="string"> rev_rmnet4 </data>
+        <data type="string"> rev_rmnet5 </data>
+        <data type="string"> rev_rmnet6 </data>
+        <data type="string"> rev_rmnet7 </data>
+        <data type="string"> rev_rmnet8 </data>
+      </list>
+   </listitem>
+
+   <!-- Fusion4 parameters -->
+   <listitem name = "mdm">
+
+      <data name="qmi_dpm_enabled" type="int"> 0 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 0 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet_usb0 </data>
+      <data name="single_qmux_ch_name" type="string"> HSICTL0 </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 4096 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet_usb0 </data>
+
+      <data name="pnd_rps_mask" type="int"> 0 </data>
+      <data name="netdev_budget" type="int"> 0 </data>
+
+      <data name="low_latency_filters" type="int"> 1 </data>
+
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 8 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet_usb0 </data>
+         <data type="string"> rmnet_usb1 </data>
+         <data type="string"> rmnet_usb2 </data>
+         <data type="string"> rmnet_usb3 </data>
+         <data type="string"> rmnet_usb4 </data>
+         <data type="string"> rmnet_usb5 </data>
+         <data type="string"> rmnet_usb6 </data>
+         <data type="string"> rmnet_usb7 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 8 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+         <data type="string"> rev_rmnet_usb0 </data>
+         <data type="string"> rev_rmnet_usb1 </data>
+         <data type="string"> rev_rmnet_usb2 </data>
+         <data type="string"> rev_rmnet_usb3 </data>
+         <data type="string"> rev_rmnet_usb4 </data>
+         <data type="string"> rev_rmnet_usb5 </data>
+         <data type="string"> rev_rmnet_usb6 </data>
+         <data type="string"> rev_rmnet_usb7 </data>
+         <data type="string"> rev_rmnet_usb8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
+   </listitem>
+
    <!-- Fusion4.5 (PCIe) parameters -->
    <listitem name = "fusion4_5_pcie">
 
       <data name="qmi_dpm_enabled" type="int"> 0 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="ep_type" type="int"> 3 </data> <!-- PCIE -->
 
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
       <data name="single_qmux_ch_conn_id_str" type="string"> rmnet_mhi0 </data>
@@ -22,10 +187,14 @@
       <data name="rmnet_data_enabled" type="int"> 1 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
       <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
-      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
       <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
-
-      <data name="rps_mask" type="int"> 1 </data>
+      <data name="pnd_rps_mask" type="int"> 1 </data>
+      <data name="qos_via_idl" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 9 </data>
 
       <data name="low_latency_filters" type="int"> 1 </data>
@@ -86,13 +255,13 @@
         <data type="string"> r_rmnet_data7 </data>
         <data type="string"> r_rmnet_data8 </data>
       </list>
-
    </listitem>
 
    <!-- MSM8994 parameters -->
    <listitem name = "msm8994">
 
       <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
 
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
@@ -102,12 +271,17 @@
       <data name="rmnet_data_enabled" type="int"> 1 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
       <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
       <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
       <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-
-      <data name="rps_mask" type="int"> 0 </data>
+      <data name="pnd_rps_mask" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 0 </data>
       <data name="low_latency_filters" type="int"> 0 </data>
+      <data name="netdev_max_backlog" type="int"> 10000 </data>
 
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -166,7 +340,6 @@
         <data type="string"> r_rmnet_data7 </data>
         <data type="string"> r_rmnet_data8 </data>
       </list>
-
    </listitem>
 
    <!-- DPM 2.0 parameters -->
@@ -182,9 +355,14 @@
       <data name="rmnet_data_enabled" type="int"> 1 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
       <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
-      <data name="phys_net_dev" type="string"> rmnet0 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
       <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
-      <data name="rps_mask" type="int"> 10 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet0 </data>
+      <data name="pnd_rps_mask" type="int"> 16 </data>
+      <data name="qos_via_idl" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 0 </data>
       <data name="low_latency_filters" type="int"> 0 </data>
       <data name="num_modems" type="int"> 2 </data>
@@ -243,13 +421,13 @@
         <data type="string"> r_rmnet_data7 </data>
         <data type="string"> r_rmnet_data8 </data>
       </list>
-
    </listitem>
 
    <!-- JOLOKIA parameters -->
    <listitem name = "jolokia">
 
       <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
       <data name="ep_type" type="int"> 5 </data> <!-- DATA_EP_TYPE_BAM_DMUX_V01 -->
 
@@ -260,12 +438,16 @@
       <data name="rmnet_data_enabled" type="int"> 1 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
       <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
       <data name="phys_net_dev" type="string"> rmnet0 </data>
       <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
-      <data name="rps_mask" type="int"> 2 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="netdev_budget" type="int"> 9 </data>
       <data name="low_latency_filters" type="int"> 1 </data>
-
+      <data name="qos_via_idl" type="int"> 0 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
          <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -322,12 +504,210 @@
         <data type="string"> r_rmnet_data7 </data>
         <data type="string"> r_rmnet_data8 </data>
       </list>
+
+   </listitem>
+
+   <!-- lykan parameters -->
+   <listitem name = "lykan">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="ep_type" type="int"> 5 </data> <!-- DATA_EP_TYPE_BAM_DMUX_V01 -->
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="pnd_rps_mask" type="int"> 0 </data>
+      <data name="netdev_budget" type="int"> 9 </data>
+      <data name="low_latency_filters" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 8 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 8 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
    </listitem>
 
+
    <!-- MSM8992 parameters -->
    <listitem name = "msm8992">
 
       <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+      <data name="pnd_rps_mask" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 0 </data>
+      <data name="netdev_budget" type="int"> 0 </data>
+      <data name="low_latency_filters" type="int"> 0 </data>
+
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 8 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 8 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+         <data type="string"> r_rmnet_data0 </data>
+         <data type="string"> r_rmnet_data1 </data>
+         <data type="string"> r_rmnet_data2 </data>
+         <data type="string"> r_rmnet_data3 </data>
+         <data type="string"> r_rmnet_data4 </data>
+         <data type="string"> r_rmnet_data5 </data>
+         <data type="string"> r_rmnet_data6 </data>
+         <data type="string"> r_rmnet_data7 </data>
+         <data type="string"> r_rmnet_data8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
+   </listitem>
+
+<listitem name = "tesla">
+     <data name="qmi_dpm_enabled" type="int"> 1 </data>
+     <data name="wda_data_format_enabled" type="int"> 1 </data>
+
+     <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+     <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+     <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
+     <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+     <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+     <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+     <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+     <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 0n </data>
+
+     <data name="low_latency_filters" type="int"> 0 </data>
+
+     <data name="frag_low_mem" type="int"> 300000 </data>
+     <data name="frag_high_mem" type="int"> 400000 </data>
+
+     <data name="num_modems" type="int"> 2 </data>
+     <list name="modems_enabled">
+        <data type="int"> 1 </data> <!-- MODEM_MSM -->
+        <data type="int"> 0 </data> <!-- MODEM_MDM -->
+     </list>
+
+     <data name="control_ports_len" type="int"> 8 </data>
+     <list name="control_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <data name="data_ports_len" type="int"> 8 </data>
+     <list name="data_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+     </list>
+   </listitem>
+
+   <!-- MSM8952/MSM8956 parameters -->
+   <listitem name = "tabasco">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
 
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
@@ -337,12 +717,184 @@
       <data name="rmnet_data_enabled" type="int"> 1 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
       <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+      <data name="pnd_rps_mask" type="int"> 16 </data>
+      <data name="netdev_budget" type="int"> 0 </data>
+      <data name="low_latency_filters" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 8 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 8 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+         <data type="string"> r_rmnet_data0 </data>
+         <data type="string"> r_rmnet_data1 </data>
+         <data type="string"> r_rmnet_data2 </data>
+         <data type="string"> r_rmnet_data3 </data>
+         <data type="string"> r_rmnet_data4 </data>
+         <data type="string"> r_rmnet_data5 </data>
+         <data type="string"> r_rmnet_data6 </data>
+         <data type="string"> r_rmnet_data7 </data>
+         <data type="string"> r_rmnet_data8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
+   </listitem>
+   <!-- MSM8976 parameters -->
+   <listitem name = "Eldarion">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
       <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 7 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+
+      <data name="rps_mask" type="int"> 01 </data>
+      <data name="netdev_budget" type="int"> 0 </data>
+      <data name="low_latency_filters" type="int"> 0 </data>
+
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+         <data type="int"> 1 </data> <!-- MODEM_MSM -->
+         <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 8 </data>
+      <list name="control_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 8 </data>
+      <list name="data_ports">
+         <data type="string"> rmnet_data0 </data>
+         <data type="string"> rmnet_data1 </data>
+         <data type="string"> rmnet_data2 </data>
+         <data type="string"> rmnet_data3 </data>
+         <data type="string"> rmnet_data4 </data>
+         <data type="string"> rmnet_data5 </data>
+         <data type="string"> rmnet_data6 </data>
+         <data type="string"> rmnet_data7 </data>
+      </list>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <list name="rev_control_ports">
+         <data type="string"> r_rmnet_data0 </data>
+         <data type="string"> r_rmnet_data1 </data>
+         <data type="string"> r_rmnet_data2 </data>
+         <data type="string"> r_rmnet_data3 </data>
+         <data type="string"> r_rmnet_data4 </data>
+         <data type="string"> r_rmnet_data5 </data>
+         <data type="string"> r_rmnet_data6 </data>
+         <data type="string"> r_rmnet_data7 </data>
+         <data type="string"> r_rmnet_data8 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+      </list>
+   </listitem>
+
+   <!-- MSM8996 parameters -->
+   <listitem name = "msm8996">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
       <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
 
-      <data name="rps_mask" type="int"> 0 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
+      <data name="vnd_rps_mask" type="int"> 15 </data>
       <data name="netdev_budget" type="int"> 0 </data>
       <data name="low_latency_filters" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
 
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -401,6 +953,236 @@
         <data type="string"> r_rmnet_data7 </data>
         <data type="string"> r_rmnet_data8 </data>
       </list>
+   </listitem>
+
+  <!-- Fusion 8084 + 9x45 (PCIe) parameters -->
+  <listitem name = "fusion_8084_9x45_pcie">
+
+    <data name="use_qmuxd" type="int"> 1 </data>
+    <data name="qmi_dpm_enabled" type="int"> 0 </data>
+    <data name="dpm_retry_timeout" type="int"> 10000 </data>
+    <data name="wda_data_format_enabled" type="int"> 1 </data>
+    <data name="ep_type" type="int"> 3 </data>
+
+    <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+    <data name="single_qmux_ch_conn_id_str" type="string"> rmnet_mhi0 </data>
+    <data name="single_qmux_ch_name" type="string"> MHICTL0 </data>
+
+    <data name="rmnet_data_enabled" type="int"> 1 </data>
+    <data name="dataformat_agg_dl_pkt" type="int"> 32 </data>
+    <data name="dataformat_agg_dl_size" type="int"> 16384 </data>
+    <data name="dataformat_agg_ul_pkt" type="int"> 32 </data>
+    <data name="dataformat_agg_ul_size" type="int"> 16384 </data>
+    <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+    <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+    <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+    <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
+
+    <data name="pnd_rps_mask" type="int"> 1 </data>
+    <data name="vnd_rps_mask" type="int"> 0 </data>
+    <data name="netdev_budget" type="int"> 9 </data>
+    <data name="low_latency_filters" type="int"> 0 </data>
+
+    <data name="num_modems" type="int"> 2 </data>
+    <list name="modems_enabled">
+      <data type="int"> 1 </data> <!-- MODEM_MSM -->
+      <data type="int"> 0 </data> <!-- MODEM_MDM -->
+    </list>
 
+    <data name="control_ports_len" type="int"> 8 </data>
+    <list name="control_ports">
+      <data type="string"> rmnet_data0 </data>
+      <data type="string"> rmnet_data1 </data>
+      <data type="string"> rmnet_data2 </data>
+      <data type="string"> rmnet_data3 </data>
+      <data type="string"> rmnet_data4 </data>
+      <data type="string"> rmnet_data5 </data>
+      <data type="string"> rmnet_data6 </data>
+      <data type="string"> rmnet_data7 </data>
+    </list>
+
+    <data name="data_ports_len" type="int"> 8 </data>
+    <list name="data_ports">
+      <data type="string"> rmnet_data0 </data>
+      <data type="string"> rmnet_data1 </data>
+      <data type="string"> rmnet_data2 </data>
+      <data type="string"> rmnet_data3 </data>
+      <data type="string"> rmnet_data4 </data>
+      <data type="string"> rmnet_data5 </data>
+      <data type="string"> rmnet_data6 </data>
+      <data type="string"> rmnet_data7 </data>
+    </list>
+
+    <data name="iwlan_enable" type="int"> 1 </data>
+    <data name="rev_control_ports_len" type="int"> 9 </data>
+    <list name="rev_control_ports">
+      <data type="string"> r_rmnet_data0 </data>
+      <data type="string"> r_rmnet_data1 </data>
+      <data type="string"> r_rmnet_data2 </data>
+      <data type="string"> r_rmnet_data3 </data>
+      <data type="string"> r_rmnet_data4 </data>
+      <data type="string"> r_rmnet_data5 </data>
+      <data type="string"> r_rmnet_data6 </data>
+      <data type="string"> r_rmnet_data7 </data>
+      <data type="string"> r_rmnet_data8 </data>
+    </list>
+
+    <data name="rev_data_ports_len" type="int"> 9 </data>
+    <list name="rev_data_ports">
+      <data type="string"> r_rmnet_data0 </data>
+      <data type="string"> r_rmnet_data1 </data>
+      <data type="string"> r_rmnet_data2 </data>
+      <data type="string"> r_rmnet_data3 </data>
+      <data type="string"> r_rmnet_data4 </data>
+      <data type="string"> r_rmnet_data5 </data>
+      <data type="string"> r_rmnet_data6 </data>
+      <data type="string"> r_rmnet_data7 </data>
+      <data type="string"> r_rmnet_data8 </data>
+    </list>
+  </listitem>
+
+<listitem name = "atlas">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+
+     <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+     <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+     <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
+     <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
+     <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
+     <data name="dataformat_agg_ul_size" type="int"> 0 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+     <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+     <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+      <data name="qos_via_idl" type="int"> 0 </data>
+
+     <data name="low_latency_filters" type="int"> 0 </data>
+
+     <data name="frag_low_mem" type="int"> 300000 </data>
+     <data name="frag_high_mem" type="int"> 400000 </data>
+
+     <data name="num_modems" type="int"> 2 </data>
+     <list name="modems_enabled">
+        <data type="int"> 1 </data> <!-- MODEM_MSM -->
+        <data type="int"> 0 </data> <!-- MODEM_MDM -->
+     </list>
+
+     <data name="control_ports_len" type="int"> 8 </data>
+     <list name="control_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+     </list>
+
+     <data name="data_ports_len" type="int"> 8 </data>
+     <list name="data_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+     </list>
    </listitem>
+
+  <!-- Fusion 8096 + 9x55 (PCIe) parameters -->
+  <listitem name = "fusion_8096_9x55_pcie">
+
+    <data name="use_qmuxd" type="int"> 1 </data>
+    <data name="qmi_dpm_enabled" type="int"> 0 </data>
+    <data name="dpm_retry_timeout" type="int"> 10000 </data>
+    <data name="wda_data_format_enabled" type="int"> 1 </data>
+    <data name="ep_type" type="int"> 3 </data>
+
+    <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+    <data name="single_qmux_ch_conn_id_str" type="string"> rmnet_mhi0 </data>
+    <data name="single_qmux_ch_name" type="string"> MHICTL0 </data>
+
+    <data name="rmnet_data_enabled" type="int"> 1 </data>
+    <data name="dataformat_agg_dl_pkt" type="int"> 32 </data>
+    <data name="dataformat_agg_dl_size" type="int"> 16384 </data>
+    <data name="dataformat_agg_ul_pkt" type="int"> 32 </data>
+    <data name="dataformat_agg_ul_size" type="int"> 16384 </data>
+    <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
+    <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
+    <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
+    <data name="phys_net_dev" type="string"> rmnet_mhi0 </data>
+
+    <data name="pnd_rps_mask" type="int"> 0 </data>
+    <data name="vnd_rps_mask" type="int"> 0 </data>
+    <data name="netdev_budget" type="int"> 0 </data>
+    <data name="low_latency_filters" type="int"> 0 </data>
+
+    <data name="num_modems" type="int"> 2 </data>
+    <list name="modems_enabled">
+      <data type="int"> 1 </data> <!-- MODEM_MSM -->
+      <data type="int"> 0 </data> <!-- MODEM_MDM -->
+    </list>
+
+    <data name="control_ports_len" type="int"> 8 </data>
+    <list name="control_ports">
+      <data type="string"> rmnet_data0 </data>
+      <data type="string"> rmnet_data1 </data>
+      <data type="string"> rmnet_data2 </data>
+      <data type="string"> rmnet_data3 </data>
+      <data type="string"> rmnet_data4 </data>
+      <data type="string"> rmnet_data5 </data>
+      <data type="string"> rmnet_data6 </data>
+      <data type="string"> rmnet_data7 </data>
+    </list>
+
+    <data name="data_ports_len" type="int"> 8 </data>
+    <list name="data_ports">
+      <data type="string"> rmnet_data0 </data>
+      <data type="string"> rmnet_data1 </data>
+      <data type="string"> rmnet_data2 </data>
+      <data type="string"> rmnet_data3 </data>
+      <data type="string"> rmnet_data4 </data>
+      <data type="string"> rmnet_data5 </data>
+      <data type="string"> rmnet_data6 </data>
+      <data type="string"> rmnet_data7 </data>
+    </list>
+
+    <data name="iwlan_enable" type="int"> 1 </data>
+    <data name="rev_control_ports_len" type="int"> 9 </data>
+    <list name="rev_control_ports">
+      <data type="string"> r_rmnet_data0 </data>
+      <data type="string"> r_rmnet_data1 </data>
+      <data type="string"> r_rmnet_data2 </data>
+      <data type="string"> r_rmnet_data3 </data>
+      <data type="string"> r_rmnet_data4 </data>
+      <data type="string"> r_rmnet_data5 </data>
+      <data type="string"> r_rmnet_data6 </data>
+      <data type="string"> r_rmnet_data7 </data>
+      <data type="string"> r_rmnet_data8 </data>
+    </list>
+
+    <data name="rev_data_ports_len" type="int"> 9 </data>
+    <list name="rev_data_ports">
+      <data type="string"> r_rmnet_data0 </data>
+      <data type="string"> r_rmnet_data1 </data>
+      <data type="string"> r_rmnet_data2 </data>
+      <data type="string"> r_rmnet_data3 </data>
+      <data type="string"> r_rmnet_data4 </data>
+      <data type="string"> r_rmnet_data5 </data>
+      <data type="string"> r_rmnet_data6 </data>
+      <data type="string"> r_rmnet_data7 </data>
+      <data type="string"> r_rmnet_data8 </data>
+    </list>
+  </listitem>
+
 </list>
diff --git a/configs/data/qmi_config.xml b/configs/data/qmi_config.xml
index 27cd674..06d6b1a 100644
--- a/configs/data/qmi_config.xml
+++ b/configs/data/qmi_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      QMI Module configuration XML file
-     Copyright (c) 2013-2014 Qualcomm Technologies, Inc.  All Rights Reserved.
+     Copyright (c) 2013-2015 Qualcomm Technologies, Inc.  All Rights Reserved.
      Qualcomm Technologies Proprietary and Confidential.
 -->
 
@@ -57,10 +57,53 @@
 
    </listitem>
 
+  <!-- Fusion 8084 + 9x45  parameters-->
+  <listitem name = "fusion_8084_9x45_pcie">
+    <data name="single_qmux_ch" type="int"> 1 </data>
+    <data name="control_ports_len" type="int"> 2 </data>
+
+    <list name="conn_str">
+      <data type="string"> QMI_PORT_RMNET_MHI_0 </data>
+      <data type="string"> QMI_PORT_RMNET_MHI_1 </data>
+    </list>
+
+    <list name="conn_id">
+      <data type="string"> QMI_CONN_ID_RMNET_MHI_0 </data>
+      <data type="string"> QMI_CONN_ID_RMNET_MHI_1 </data>
+    </list>
+
+    <list name="dev_name">
+      <data type="string"> /dev/mhi_pipe_14 </data>
+      <data type="string"> /dev/mhi_pipe_16 </data>
+    </list>
+
+    <list name="ch_name">
+      <data type="string"> MHICTL0 </data>
+      <data type="string"> MHICTL1 </data>
+    </list>
+
+    <list name="transport">
+      <data type="string"> LINUX_QMI_TRANSPORT_MHI </data>
+      <data type="string"> LINUX_QMI_TRANSPORT_MHI </data>
+    </list>
+
+    <list name="enabled">
+      <data type="int"> 1 </data>
+      <data type="int"> 1 </data>
+    </list>
+
+    <list name="open_at_powerup">
+      <data type="int"> 1 </data>
+      <data type="int"> 0 </data>
+    </list>
+  </listitem>
+
    <!-- MSM8994 parameters -->
    <listitem name = "msm8994">
 
       <data name="single_qmux_ch" type="int"> 1 </data>
+      <data name="dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 1 </data>
       <data name="control_ports_len" type="int"> 1 </data>
 
       <list name="conn_str">
@@ -103,10 +146,204 @@
 
    </listitem>
 
+   <!-- MDM9X40/MDM9X45 (Tesla) parameters -->
+   <listitem name = "tesla">
+       <data name="single_qmux_ch" type="int"> 1 </data>
+       <data name="dpm_enabled" type="int"> 1 </data>
+       <data name="use_qmuxd" type="int"> 1 </data>
+       <data name="control_ports_len" type="int"> 2 </data>
+
+       <list name="conn_str">
+          <data type="string"> QMI_PORT_RMNET_0 </data>
+          <data type="string"> QMI_PORT_RMNET_8 </data>
+       </list>
+
+       <list name="conn_id">
+          <data type="string"> QMI_CONN_ID_RMNET_0 </data>
+          <data type="string"> QMI_CONN_ID_RMNET_8 </data>
+       </list>
+
+       <list name="dev_name">
+          <data type="string"> /dev/smdcntl0 </data>
+          <data type="string"> /dev/smdcntl8 </data>
+       </list>
+
+       <list name="ch_name">
+          <data type="string"> DATA5_CNTL </data>
+          <data type="string"> DATA40_CNTL </data>
+       </list>
+
+       <list name="transport">
+          <data type="string"> LINUX_QMI_TRANSPORT_BAM </data>
+          <data type="string"> LINUX_QMI_TRANSPORT_BAM </data>
+       </list>
+
+       <list name="enabled">
+          <data type="int"> 1 </data>
+          <data type="int"> 1 </data>
+       </list>
+
+       <list name="open_at_powerup">
+          <data type="int"> 1 </data>
+          <data type="int"> 0 </data>
+       </list>
+   </listitem>
+
    <!-- MSM8992 parameters -->
    <listitem name = "msm8992">
 
       <data name="single_qmux_ch" type="int"> 1 </data>
+      <data name="dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 1 </data>
+      <data name="control_ports_len" type="int"> 2 </data>
+
+      <list name="conn_str">
+         <data type="string"> QMI_PORT_RMNET_0 </data>
+         <data type="string"> QMI_PORT_RMNET_8 </data>
+      </list>
+
+      <list name="conn_id">
+         <data type="string"> QMI_CONN_ID_RMNET_0 </data>
+         <data type="string"> QMI_CONN_ID_RMNET_8 </data>
+      </list>
+
+      <list name="dev_name">
+         <data type="string"> /dev/smdcntl0 </data>
+         <data type="string"> /dev/smdcntl8 </data>
+      </list>
+
+      <list name="dev_name_test">
+         <data type="string"> /tmp/data/smdcntl0 </data>
+         <data type="string"> /tmp/data/smdcntl8 </data>
+      </list>
+
+      <list name="ch_name">
+         <data type="string"> DATA5_CNTL </data>
+         <data type="string"> DATA40_CNTL </data>
+      </list>
+
+      <list name="transport">
+         <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
+         <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
+      </list>
+
+      <list name="enabled">
+         <data type="int"> 1 </data>
+         <data type="int"> 1 </data>
+      </list>
+
+      <list name="open_at_powerup">
+         <data type="int"> 1 </data>
+         <data type="int"> 0 </data>
+      </list>
+
+   </listitem>
+
+   <!-- MSM8952/MSM8956 parameters -->
+   <listitem name = "tabasco">
+
+      <data name="single_qmux_ch" type="int"> 1 </data>
+      <data name="dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 1 </data>
+      <data name="control_ports_len" type="int"> 2 </data>
+
+      <list name="conn_str">
+         <data type="string"> QMI_PORT_RMNET_0 </data>
+         <data type="string"> QMI_PORT_RMNET_8 </data>
+      </list>
+
+      <list name="conn_id">
+         <data type="string"> QMI_CONN_ID_RMNET_0 </data>
+         <data type="string"> QMI_CONN_ID_RMNET_8 </data>
+      </list>
+
+      <list name="dev_name">
+         <data type="string"> /dev/smdcntl0 </data>
+         <data type="string"> /dev/smdcntl8 </data>
+      </list>
+
+      <list name="dev_name_test">
+         <data type="string"> /tmp/data/smdcntl0 </data>
+         <data type="string"> /tmp/data/smdcntl8 </data>
+      </list>
+
+      <list name="ch_name">
+         <data type="string"> DATA5_CNTL </data>
+         <data type="string"> DATA40_CNTL </data>
+      </list>
+
+      <list name="transport">
+         <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
+         <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
+      </list>
+
+      <list name="enabled">
+         <data type="int"> 1 </data>
+         <data type="int"> 1 </data>
+      </list>
+
+      <list name="open_at_powerup">
+         <data type="int"> 1 </data>
+         <data type="int"> 0 </data>
+      </list>
+
+   </listitem>
+
+   <!-- MSM8996 parameters -->
+   <listitem name = "msm8996">
+
+      <data name="single_qmux_ch" type="int"> 1 </data>
+      <data name="control_ports_len" type="int"> 2 </data>
+      <data name="dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+
+      <list name="conn_str">
+         <data type="string"> QMI_PORT_RMNET_0 </data>
+         <data type="string"> QMI_PORT_RMNET_8 </data>
+      </list>
+
+      <list name="conn_id">
+         <data type="string"> QMI_CONN_ID_RMNET_0 </data>
+         <data type="string"> QMI_CONN_ID_RMNET_8 </data>
+      </list>
+
+      <list name="dev_name">
+         <data type="string"> /dev/smdcntl0 </data>
+         <data type="string"> /dev/smdcntl8 </data>
+      </list>
+
+      <list name="dev_name_test">
+         <data type="string"> /tmp/data/smdcntl0 </data>
+         <data type="string"> /tmp/data/smdcntl8 </data>
+      </list>
+
+      <list name="ch_name">
+         <data type="string"> DATA5_CNTL </data>
+         <data type="string"> DATA40_CNTL </data>
+      </list>
+
+      <list name="transport">
+         <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
+         <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
+      </list>
+
+      <list name="enabled">
+         <data type="int"> 1 </data>
+         <data type="int"> 1 </data>
+      </list>
+
+      <list name="open_at_powerup">
+         <data type="int"> 1 </data>
+         <data type="int"> 0 </data>
+      </list>
+
+   </listitem>
+   <!-- MSM8976 parameters -->
+   <listitem name = "Eldarion">
+
+      <data name="single_qmux_ch" type="int"> 1 </data>
+      <data name="dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 1 </data>
       <data name="control_ports_len" type="int"> 2 </data>
 
       <list name="conn_str">
@@ -150,5 +387,91 @@
       </list>
 
    </listitem>
+
+   <!-- MDM9X50/MDM9X55 (Atlas) parameters -->
+   <listitem name = "atlas">
+
+       <data name="single_qmux_ch" type="int"> 1 </data>
+       <data name="dpm_enabled" type="int"> 1 </data>
+       <data name="use_qmuxd" type="int"> 0 </data>
+       <data name="control_ports_len" type="int"> 2 </data>
+
+       <list name="conn_str">
+          <data type="string"> QMI_PORT_RMNET_0 </data>
+          <data type="string"> QMI_PORT_RMNET_8 </data>
+       </list>
+
+       <list name="conn_id">
+          <data type="string"> QMI_CONN_ID_RMNET_0 </data>
+          <data type="string"> QMI_CONN_ID_RMNET_8 </data>
+       </list>
+
+       <list name="dev_name">
+          <data type="string"> /dev/smdcntl0 </data>
+          <data type="string"> /dev/smdcntl8 </data>
+       </list>
+
+       <list name="ch_name">
+          <data type="string"> DATA5_CNTL </data>
+          <data type="string"> DATA40_CNTL </data>
+       </list>
+
+       <list name="transport">
+          <data type="string"> LINUX_QMI_TRANSPORT_BAM </data>
+          <data type="string"> LINUX_QMI_TRANSPORT_BAM </data>
+       </list>
+
+       <list name="enabled">
+          <data type="int"> 1 </data>
+          <data type="int"> 1 </data>
+       </list>
+
+       <list name="open_at_powerup">
+          <data type="int"> 1 </data>
+          <data type="int"> 0 </data>
+       </list>
+   </listitem>
+
+  <!-- Fusion 8096 + 9x55  parameters-->
+  <listitem name = "fusion_8096_9x55_pcie">
+    <data name="single_qmux_ch" type="int"> 1 </data>
+    <data name="control_ports_len" type="int"> 2 </data>
+
+    <list name="conn_str">
+      <data type="string"> QMI_PORT_RMNET_MHI_0 </data>
+      <data type="string"> QMI_PORT_RMNET_MHI_1 </data>
+    </list>
+
+    <list name="conn_id">
+      <data type="string"> QMI_CONN_ID_RMNET_MHI_0 </data>
+      <data type="string"> QMI_CONN_ID_RMNET_MHI_1 </data>
+    </list>
+
+    <list name="dev_name">
+      <data type="string"> /dev/mhi_pipe_14 </data>
+      <data type="string"> /dev/mhi_pipe_16 </data>
+    </list>
+
+    <list name="ch_name">
+      <data type="string"> MHICTL0 </data>
+      <data type="string"> MHICTL1 </data>
+    </list>
+
+    <list name="transport">
+      <data type="string"> LINUX_QMI_TRANSPORT_MHI </data>
+      <data type="string"> LINUX_QMI_TRANSPORT_MHI </data>
+    </list>
+
+    <list name="enabled">
+      <data type="int"> 1 </data>
+      <data type="int"> 1 </data>
+    </list>
+
+    <list name="open_at_powerup">
+      <data type="int"> 1 </data>
+      <data type="int"> 0 </data>
+    </list>
+  </listitem>
+
 </list>
 
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index fc38d5e..ff76ece 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -121,19 +121,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="qvga" fileFormat="mp4" duration="60">
-      <Video codec="h264"
-             bitRate="512000"
-             width="320"
-             height="240"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="156000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
     <EncoderProfile quality="cif" fileFormat="3gp" duration="30">
       <Video codec="h264"
              bitRate="720000"
@@ -147,20 +134,6 @@
              channels="1" />
     </EncoderProfile>
 
-    <EncoderProfile quality="fwvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="864"
-             height="480"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -200,32 +173,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
-      <Video codec="h264"
-             bitRate="192000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="wvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="800"
-             height="480"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="156000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
     <EncoderProfile quality="vga" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -267,20 +214,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="192000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="720000"
@@ -295,35 +228,6 @@
              channels="1" />
     </EncoderProfile>
 
-
-    <EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="512000"
-             width="320"
-             height="240"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapsewqvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="720000"
-             width="432"
-             height="240"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -338,34 +242,6 @@
              channels="1" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapsewvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="800"
-             height="480"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapsefwvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="864"
-             height="480"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -469,20 +345,6 @@
              channels="1" />
     </EncoderProfile>
 
-    <EncoderProfile quality="fwvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="864"
-             height="480"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -522,32 +384,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
-      <Video codec="h264"
-             bitRate="192000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="wvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="800"
-             height="480"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="156000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
      <EncoderProfile quality="vga" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -589,20 +425,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="192000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="1200000"
@@ -631,20 +453,6 @@
              channels="1" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapsewqvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="720000"
-             width="432"
-             height="240"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="2000000"
@@ -659,34 +467,6 @@
              channels="1" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapsewvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="800"
-             height="480"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapsefwvga" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="2000000"
-             width="864"
-             height="480"
-             frameRate="30" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
     <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
       <Video codec="h264"
              bitRate="5000000"
diff --git a/liblight/lights.c b/liblight/lights.c
index e70485e..e0abd29 100644
--- a/liblight/lights.c
+++ b/liblight/lights.c
@@ -21,6 +21,7 @@
 #include <cutils/log.h>
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/overlay/frameworks/base/core/res/res/values/cm_strings.xml b/overlay/frameworks/base/core/res/res/values/cm_strings.xml
index a8927d6..09107d7 100644
--- a/overlay/frameworks/base/core/res/res/values/cm_strings.xml
+++ b/overlay/frameworks/base/core/res/res/values/cm_strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Default wi-fi direct name -->
-    <string name="def_wifi_direct_name" translatable="false">Wileyfox Swift</string>
 </resources>
diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
index f9f8aac..995a8d5 100644
--- a/proprietary-files-qc.txt
+++ b/proprietary-files-qc.txt
@@ -264,7 +264,7 @@ vendor/lib/libqmi_encdec.so
 vendor/lib/libsmemlog.so
 
 # Radio
--app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 -app/shutdownlistener/shutdownlistener.apk
 bin/netmgrd
 bin/qmuxd
@@ -290,7 +290,7 @@ vendor/lib64/libxml.so
 -vendor/lib/libmdmdetect.so
 
 # Thermal
-bin/thermal-engine
+vendor/bin/thermal-engine
 vendor/lib/libthermalclient.so
 vendor/lib64/libthermalclient.so
 vendor/lib64/libthermalioctl.so
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 239e6ec..d211df9 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -53,17 +53,6 @@ on boot
     write /sys/module/lowmemorykiller/parameters/enable_adaptive_lmk 1
     write /sys/module/lowmemorykiller/parameters/vmpressure_file_min 81250
 
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
-    class late_start
-
-service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
-    class late_start
-    disabled
-
-service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usbdisk /storage/usbdisk
-    class late_start
-    disabled
-
 service charger /charger
     class charger
     group log
diff --git a/sensors/bst/hal/LightSensor.cpp b/sensors/bst/hal/LightSensor.cpp
index 058ecc8..4456c30 100755
--- a/sensors/bst/hal/LightSensor.cpp
+++ b/sensors/bst/hal/LightSensor.cpp
@@ -31,11 +31,11 @@
 /*****************************************************************************/
 
 enum input_device_name {
-	GENERIC_LS = 0,
+	LTR559_LS = 0,
+	GENERIC_LS,
 	LIGHTSENSOR_LEVEL,
 	CM36283_LS,
 	STK3x1x_LS,
-    LTR559_LS,
 	SUPPORTED_LSENSOR_COUNT,
 };
 
@@ -45,36 +45,36 @@ enum {
 };
 
 static const char *data_device_name[] = {
+    [LTR559_LS] = "ltr559-ls",
 	[GENERIC_LS] = "light",
 	[LIGHTSENSOR_LEVEL] = "lightsensor-level",
 	[CM36283_LS] = "cm36283-ls",
 	[STK3x1x_LS] = "stk3x1x-ls",
-    [LTR559_LS] = "ltr559-ls",
 };
 
 static const char *input_sysfs_path_list[] = {
 	/* This one is for back compatibility, we don't need it for generic HAL.*/
+    [LTR559_LS] = "/sys/class/input/%s/device/",
 	[GENERIC_LS] = "/sys/class/input/%s/device/",
 	[LIGHTSENSOR_LEVEL] = "/sys/class/input/%s/device/",
 	[CM36283_LS] = "/sys/class/input/%s/device/",
 	[STK3x1x_LS] = "/sys/class/input/%s/device/",
-    [LTR559_LS] = "/sys/class/input/%s/device/",
 };
 
 static const char *input_sysfs_enable_list[] = {
+    [LTR559_LS] = "enable_als_sensor",
 	[GENERIC_LS] = "enable",
 	[LIGHTSENSOR_LEVEL] = "enable",
 	[CM36283_LS] = "enable",
 	[STK3x1x_LS] = "enable",    
-    [LTR559_LS] = "enable_als_sensor",
 };
 
 static const int input_report_type[] = {
+    [LTR559_LS] = TYPE_LUX,
 	[GENERIC_LS] = TYPE_LUX,
 	[LIGHTSENSOR_LEVEL] = TYPE_ADC,
 	[CM36283_LS] = TYPE_LUX,
 	[STK3x1x_LS] = TYPE_LUX,    
-    [LTR559_LS] = TYPE_LUX,
 };
 
 LightSensor::LightSensor()
diff --git a/sensors/bst/hal/ProximitySensor.cpp b/sensors/bst/hal/ProximitySensor.cpp
index bc36d03..e03a361 100755
--- a/sensors/bst/hal/ProximitySensor.cpp
+++ b/sensors/bst/hal/ProximitySensor.cpp
@@ -34,37 +34,37 @@
 /*****************************************************************************/
 
 enum input_device_name {
-    GENERIC_PSENSOR = 0,
+    LTR559_PS = 0,
+    GENERIC_PSENSOR,
     LEGACY_PSENSOR,
     CM36283_PS,
 	STK3x1x_PS,
-    LTR559_PS,
     SUPPORTED_PSENSOR_COUNT,
 };
 
 static const char *data_device_name[] = {
+        [LTR559_PS] = "ltr559-ps",
    [GENERIC_PSENSOR] = "proximity",
     [LEGACY_PSENSOR] = "proximity",
         [CM36283_PS] = "cm36283-ps",
 		[STK3x1x_PS] = "stk3x1x-ps",
-        [LTR559_PS] = "ltr559-ps",
 };
 
 static const char *input_sysfs_path_list[] = {
    /* This is not used by generic HAL. Just for back compatibility */
+        [LTR559_PS] = "/sys/class/input/%s/device/",
    [GENERIC_PSENSOR] = "/sys/class/input/%s/device/",
     [LEGACY_PSENSOR] = "/sys/class/input/%s/device/",
         [CM36283_PS] = "/sys/class/input/%s/device/",
 		[STK3x1x_PS] = "/sys/class/input/%s/device/",
-        [LTR559_PS] = "/sys/class/input/%s/device/",
 };
 
 static const char *input_sysfs_enable_list[] = {
+        [LTR559_PS] = "enable",
    [GENERIC_PSENSOR] = "enable",
     [LEGACY_PSENSOR] = "enable",
         [CM36283_PS] = "enable",
 		[STK3x1x_PS] = "enable",
-        [LTR559_PS] = "enable",
 };
 
 
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index d8dbab6..802be31 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -189,7 +189,7 @@ include \$(BUILD_PREBUILT)
 include \$(CLEAR_VARS)
 LOCAL_MODULE := qcrilmsgtunnel
 LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+LOCAL_SRC_FILES := proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS