kebab-vendor.mk

@@ -19,7 +19,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/kebab/proprietary/vendor/etc/acdbdata/MTP/MTP_workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/MTP_workspaceFile.qwsp \
     vendor/oneplus/kebab/proprietary/vendor/etc/acdbdata/MTP/acdb_version:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/acdb_version \
     vendor/oneplus/kebab/proprietary/vendor/etc/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb \
-    vendor/oneplus/kebab/proprietary/vendor/etc/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
     vendor/oneplus/kebab/proprietary/vendor/etc/camera/M_Attribute_AG_BMW_1.1.0.model.hardcode:$(TARGET_COPY_OUT_VENDOR)/etc/camera/M_Attribute_AG_BMW_1.1.0.model.hardcode \
     vendor/oneplus/kebab/proprietary/vendor/etc/camera/ashdr/ncf_pack.ncf:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ashdr/ncf_pack.ncf \
     vendor/oneplus/kebab/proprietary/vendor/etc/camera/ashdr/ncf_pack_imx471.ncf:$(TARGET_COPY_OUT_VENDOR)/etc/camera/ashdr/ncf_pack_imx471.ncf \
@@ -228,7 +227,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/kebab/proprietary/vendor/etc/sensors/proto/sns_ultra_violet.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_ultra_violet.proto \
     vendor/oneplus/kebab/proprietary/vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/proto/sns_wrist_tilt_gesture.proto \
     vendor/oneplus/kebab/proprietary/vendor/etc/sensors/sns_reg_config:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sns_reg_config \
-    vendor/oneplus/kebab/proprietary/vendor/etc/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
     vendor/oneplus/kebab/proprietary/vendor/etc/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \
     vendor/oneplus/kebab/proprietary/vendor/firmware/tfa98xx.cnt:$(TARGET_COPY_OUT_VENDOR)/firmware/tfa98xx.cnt \
     vendor/oneplus/kebab/proprietary/vendor/lib64/camera/CFR_OnePlus_UW_photo_preview.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/CFR_OnePlus_UW_photo_preview.bin \

proprietary/vendor/etc/audio_effects.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--- Copyright (c) 2018-2019, 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    -->
-<!--- met:                                                                      -->
-<!---     * Redistributions of source code must retain the above copyright      -->
-<!---       notice, this list of conditions and the following disclaimer.       -->
-<!---     * Redistributions in binary form must reproduce the above             -->
-<!---       copyright notice, this list of conditions and the following         -->
-<!---       disclaimer in the documentation and/or other materials provided     -->
-<!---       with the distribution.                                              -->
-<!---     * Neither the name of The Linux Foundation nor the names of its       -->
-<!---       contributors may be used to endorse or promote products derived     -->
-<!---       from this software without specific prior written permission.       -->
-<!---                                                                           -->
-<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED              -->
-<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF      -->
-<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT    -->
-<!--- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS    -->
-<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    -->
-<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      -->
-<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR           -->
-<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     -->
-<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE      -->
-<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->
-<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->
-
-<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
-    <libraries>
-        <library name="bundle" path="libbundlewrapper.so"/>
-        <library name="reverb" path="libreverbwrapper.so"/>
-        <library name="visualizer_sw" path="libvisualizer.so"/>
-        <library name="visualizer_hw" path="libqcomvisualizer.so"/>
-        <library name="downmix" path="libdownmix.so"/>
-        <library name="loudness_enhancer" path="libldnhncr.so"/>
-        <library name="dynamics_processing" path="libdynproc.so"/>
-        <library name="proxy" path="libeffectproxy.so"/>
-        <library name="offload_bundle" path="libqcompostprocbundle.so"/>
-        <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
-        <library name="volume_listener" path="libvolumelistener.so"/>
-        <library name="audiosphere" path="libasphere.so"/>
-        <library name="shoebox" path="libshoebox.so"/>
-        <library name="haptic_effect" path="libhaptic_effect.so"/>
-    </libraries>
-    <effects>
-        <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
-            <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>
-        </effectProxy>
-        <effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">
-            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>
-        </effectProxy>
-        <effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">
-            <libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/>
-        </effectProxy>
-        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
-        <effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">
-            <libsw library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>
-        </effectProxy>
-        <effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">
-            <libsw library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>
-        </effectProxy>
-        <effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">
-            <libsw library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>
-        </effectProxy>
-        <effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">
-            <libsw library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>
-            <libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>
-        </effectProxy>
-        <effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">
-            <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
-            <libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>
-        </effectProxy>
-        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
-        <effect name="hw_acc" library="offload_bundle" uuid="7d1580bd-297f-4683-9239-e475b6d1d69f"/>
-        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
-        <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
-        <effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>
-        <effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>
-        <effect name="music_helper" library="volume_listener" uuid="08b8b058-0590-11e5-ac71-0025b32654a0"/>
-        <effect name="ring_helper" library="volume_listener" uuid="0956df94-0590-11e5-bdbe-0025b32654a0"/>
-        <effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>
-        <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
-        <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
-        <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
-        <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
-        <effect name="haptic" library="haptic_effect" uuid="17852d51-161e-11e2-892e-0800200c9a66" />
-    </effects>
-    <postprocess>
-    <!-- #ifndef OPLUS_FEATURE_DOLBY -->
-    <!-- WuHao@MULTIMEDIA.AUDIOSERVER.EFFECT, 2019/09/18, Remove for dolby -->
-    <!--
-        <stream type="music">
-            <apply effect="music_helper"/>
-        </stream>
-        <stream type="ring">
-            <apply effect="ring_helper"/>
-        </stream>
-        <stream type="alarm">
-            <apply effect="alarm_helper"/>
-        </stream>
-    -->
-    <!-- #endif OPLUS_FEATURE_DOLBY -->
-        <stream type="voice_call">
-            <apply effect="voice_helper"/>
-        </stream>
-    <!-- #ifndef OPLUS_FEATURE_DOLBY -->
-    <!-- WuHao@MULTIMEDIA.AUDIOSERVER.EFFECT, 2019/09/18, Remove for dolby -->
-    <!--
-        <stream type="notification">
-            <apply effect="notification_helper"/>
-        </stream>
-    -->
-    <!-- #endif OPLUS_FEATURE_DOLBY -->
-    </postprocess>
-    <preprocess>
-        <stream type="voice_communication">
-            <apply effect="aec"/>
-            <apply effect="ns"/>
-        </stream>
-    </preprocess>
-</audio_effects_conf>

proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc

@@ -1,7 +1,7 @@
 on init
-    start vendor.keymaster-4-1
+    start keymaster-4-1
 
-service vendor.keymaster-4-1 /vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
+service keymaster-4-1 /vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
     class early_hal
     user system
     group system drmrpc

proprietary/vendor/etc/sensors/config/bmi26x_0.json

@@ -2,7 +2,7 @@
   "config":
   {
     "hw_platform": ["QRD", "MTP", "Dragon", "Surf", "HDK", "IDP"],
-    "soc_id": ["300", "301", "336", "339", "341", "347", "355", "360", "361", "365", "366", "393", "356"]
+    "soc_id": ["356"]
   },
   "bmi26x_0":{
     "owner": "sns_bmi26x",
@@ -17,7 +17,7 @@
           "data": "0"
         },
         "res_idx":{ "type": "int", "ver": "0",
-          "data": "2"
+          "data": "3"
         },
         "sync_stream":{ "type": "int", "ver": "0",
           "data": "0"

proprietary/vendor/etc/sensors/config/kona_qrd_ak991x_0.json

@@ -1,10 +1,10 @@
 {
   "config":
   {
-    "hw_platform": ["MTP"],
+    "hw_platform": ["QRD"],
     "soc_id": ["356"]
   },
-    "ak0991x_0":{
+   "ak0991x_0":{
     "owner": "sns_ak0991x",
     ".mag":{
       "owner": "sns_ak0991x",
@@ -41,7 +41,7 @@
     "owner": "sns_ak0991x",
     ".config":{
       "owner": "sns_ak0991x",
-      "bus_type":{ "type": "int", "ver": "1",
+      "bus_type":{ "type": "int", "ver": "0",
         "data": "0"
       },
       "bus_instance":{ "type": "int", "ver": "0",
@@ -53,7 +53,7 @@
       "min_bus_speed_khz":{ "type": "int", "ver": "0",
         "data": "400"
       },
-      "max_bus_speed_khz":{ "type": "int", "ver": "1",
+      "max_bus_speed_khz":{ "type": "int", "ver": "0",
         "data": "400"
       },
       "reg_addr_type":{ "type": "int", "ver": "0",
@@ -89,14 +89,14 @@
     },
     ".orient":{
       "owner": "sns_ak0991x",
-      "x":{ "type": "str", "ver": "1",
+      "x":{ "type": "str", "ver": "0",
         "data": "+x"
       },
-      "y":{ "type": "str", "ver": "1",
+      "y":{ "type": "str", "ver": "0",
-        "data": "+y"
+        "data": "-y"
       },
-      "z":{ "type": "str", "ver": "1",
+      "z":{ "type": "str", "ver": "0",
-        "data": "+z"
+        "data": "-z"
       }
     },
     ".mag":{
@@ -105,32 +105,32 @@
         "owner": "sns_ak0991x",
         ".corr_mat":{
           "owner": "sns_ak0991x",
-          "0_0":{ "type": "flt", "ver": "1",
+          "0_0":{ "type": "flt", "ver": "0",
-            "data": "1.0"
+            "data": "0.9982"
           },
-          "0_1":{ "type": "flt", "ver": "1",
+          "0_1":{ "type": "flt", "ver": "0",
-            "data": "0.0"
+            "data": "-0.0451"
           },
-          "0_2":{ "type": "flt", "ver": "1",
+          "0_2":{ "type": "flt", "ver": "0",
-            "data": "0.0"
+            "data": "-0.0029"
           },
-          "1_0":{ "type": "flt", "ver": "1",
+          "1_0":{ "type": "flt", "ver": "0",
-            "data": "0.0"
+            "data": "-0.0451"
           },
-          "1_1":{ "type": "flt", "ver": "1",
+          "1_1":{ "type": "flt", "ver": "0",
-            "data": "1.0"
+            "data": "1.0022"
           },
-          "1_2":{ "type": "flt", "ver": "1",
+          "1_2":{ "type": "flt", "ver": "0",
-            "data": "0.0"
+            "data": "-0.0027"
           },
-          "2_0":{ "type": "flt", "ver": "1",
+          "2_0":{ "type": "flt", "ver": "0",
-            "data": "0.0"
+            "data": "-0.0029"
           },
-          "2_1":{ "type": "flt", "ver": "1",
+          "2_1":{ "type": "flt", "ver": "0",
-            "data": "0.0"
+            "data": "-0.0027"
           },
-          "2_2":{ "type": "flt", "ver": "1",
+          "2_2":{ "type": "flt", "ver": "0",
-            "data": "1.0"
+            "data": "0.9996"
           }
         },
         ".bias":{

proprietary/vendor/etc/sensors/config/kona_sx932x_0.json

@@ -35,7 +35,7 @@
         "data": "5"
       },
       "slave_config":{ "type": "int", "ver": "0",
-        "data": "40"
+        "data": "44"
       },
       "min_bus_speed_khz":{ "type": "int", "ver": "0",
         "data": "400"

proprietary/vendor/etc/sensors/config/sns_amd.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "340", "347", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400",
-    "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "455", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_amd": {
     "owner": "sns_amd",

proprietary/vendor/etc/sensors/config/sns_amd_sw_disabled.json

@@ -1,7 +1,7 @@
 {
   "config": {
     "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK"],
-    "soc_id": ["339", "340", "361", "415", "439", "456"]
+    "soc_id": ["339", "340", "356", "361", "415", "439"]
   },
   "sns_amd": {
     "owner": "sns_amd",

proprietary/vendor/etc/sensors/config/sns_amd_sw_enabled.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "347", "341", "355", "360", "365", "366", "393", "394", "400", "407", "417", "440",
-    "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "454", "450", "476", "469", "470", "473", "474"]
+    "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_amd": {
     "owner": "sns_amd",

proprietary/vendor/etc/sensors/config/sns_basic_gestures.json

@@ -1,8 +1,8 @@
 {
   "config":{
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417","440",
-    "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_basic_gestures": {
     "owner": "sns_basic_gestures",

proprietary/vendor/etc/sensors/config/sns_bring_to_ear.json

@@ -1,8 +1,8 @@
 {
   "config":{
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "415", "439", "440", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "450", "476", "469", "470", "473", "474"]
+    "415", "439", "440", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_bring_to_ear": {
     "owner": "sns_bring_to_ear",

proprietary/vendor/etc/sensors/config/sns_ccd.json

@@ -1,7 +1,7 @@
 {
   "config": {
     "hw_platform": ["MTP","QRD","Dragon","Surf", "HDK"],
-    "soc_id": ["339", "340", "356", "361", "415", "439", "456", "450"]
+    "soc_id": ["339", "340", "356", "361", "415", "439"]
   },
   "ccd_amd": {
     "owner": "sns_ccd",

proprietary/vendor/etc/sensors/config/sns_ccd_v2_walk.json

@@ -1,7 +1,7 @@
 {
   "config": {
     "hw_platform": ["MTP","QRD","Dragon","Surf", "HDK"],
-    "soc_id": ["339", "340", "361", "450"]
+    "soc_id": ["339", "340", "361"]
   },
   "ccd_walk": {
     "owner": "sns_ccd",

proprietary/vendor/etc/sensors/config/sns_ccd_v3_1_walk.json

@@ -1,7 +1,7 @@
 {
   "config": {
     "hw_platform": ["MTP", "Surf", "RCM", "QRD", "HDK"],
-    "soc_id": ["415", "439", "456"]
+    "soc_id": ["415", "439"]
   },
   "ccd_walk": {
     "owner": "sns_ccd",

proprietary/vendor/etc/sensors/config/sns_ccd_v3_walk.json

@@ -1,7 +1,7 @@
 {
   "config": {
     "hw_platform": ["MTP", "Surf", "RCM", "QRD"],
-    "soc_id": ["356", "450"]
+    "soc_id": ["356"]
   },
   "ccd_walk": {
     "owner": "sns_ccd",

proprietary/vendor/etc/sensors/config/sns_cm.json

@@ -1,8 +1,9 @@
 {
   "config":{
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "347", "355", "356", "360", "361", "365", "366", "393", "394", "400",
-    "407", "416", "417", "437", "440", "415", "439", "444", "445", "420", "424", "443", "459", "441", "471", "455", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "407", "416", "417", "437", "440", "415", "439", "444", "445", "420", "424", "443", "459", "441", "471"]
+
   },
 "sns_cm":{
     "owner": "sns_cm",

proprietary/vendor/etc/sensors/config/sns_dae.json

@@ -1,7 +1,7 @@
 {
   "config":{
     "hw_platform": ["MTP","QRD","Dragon","Surf", "HDK"],
-    "soc_id": ["339", "356", "361", "415", "439", "456", "450"]
+    "soc_id": ["339", "356", "361", "415", "439"]
   },
   "dae":{
       "owner": "sns_dae",
@@ -21,7 +21,7 @@
                   "data": "0"
                 },
       "ulog_msg_mask":{ "type": "int", "ver": "0",
-                  "data": "0x1F"
+                  "data": "0"
                 },
       "fwk_msg_mask":{ "type": "int", "ver": "0",
                   "data": "0"

proprietary/vendor/etc/sensors/config/sns_device_orient.json

@@ -1,9 +1,9 @@
 {
   "config":
   {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407",
-    "417", "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "417", "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_device_orient_platform": {
     "owner": "sns_device_orient",
@@ -19,13 +19,13 @@
          "type": "flt", "ver": "0", "data": "0.25"
       },
       "param3": {
-         "type": "flt", "ver": "1", "data": "55.0"
+         "type": "flt", "ver": "0", "data": "70.0"
       },
       "param4": {
          "type": "flt", "ver": "0", "data": "45.0"
       },
       "param5": {
-         "type": "flt", "ver": "1", "data": "0.5"
+         "type": "flt", "ver": "0", "data": "2.0"
       },
       "param6": {
          "type": "flt", "ver": "0", "data": "15.0"

proprietary/vendor/etc/sensors/config/sns_diag_filter.json

@@ -3,7 +3,7 @@
   {
     "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "347", "355", "356", "360", "361", "352", "365", "366", "393", "394", "400",
-    "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "455", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
 
   "sns_diag_config":
@@ -313,7 +313,7 @@
     {
       "type" : "int",
       "ver" : "0",
-      "data" : "0"
+      "data" : "1"
     },
     "ccd_walk":
     {
@@ -358,18 +358,6 @@
       "data" : "1"
     },
     "dae_datalog":
-    {
-      "type" : "int",
-      "ver" : "0",
-      "data" : "1"
-    },
-    "location":
-    {
-      "type" : "int",
-      "ver" : "0",
-      "data" : "1"
-    },
-    "step_detect":
     {
       "type" : "int",
       "ver" : "0",

proprietary/vendor/etc/sensors/config/sns_distance_bound.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": [ "MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_distance_bound_speed_for_motion_states": {
     "owner": "sns_distance_bound",

proprietary/vendor/etc/sensors/config/sns_dpc.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_dpc": {
     "owner": "sns_dpc",

proprietary/vendor/etc/sensors/config/sns_facing.json

@@ -1,8 +1,8 @@
 {
   "config":{
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_facing": {
     "owner": "sns_facing",

proprietary/vendor/etc/sensors/config/sns_fmv.json

@@ -1,8 +1,8 @@
 {
   "config":
   {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
-    "soc_id": ["415", "439", "456", "454","450", "469", "470"]
+    "soc_id": ["415", "439"]
   },
   "sns_fmv_platform": {
     "owner": "sns_fmv",
@@ -43,9 +43,6 @@
       },
       "amd_int_cfg_param3": { "type": "flt", "ver": "0",
         "data": "0.4"
-      },
-      "debug_mode": { "type": "int", "ver": "0",
-        "data": "0"
       }
     }
   }

proprietary/vendor/etc/sensors/config/sns_fmv_legacy.json

@@ -3,7 +3,7 @@
   {
     "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "476", "473", "474"]
+    "440", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_fmv_platform": {
     "owner": "sns_fmv",

proprietary/vendor/etc/sensors/config/sns_geomag_rv.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_geomag_rv": {
     "owner": "sns_geomag_rv",

proprietary/vendor/etc/sensors/config/sns_gyro_cal.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "347", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400",
-    "407", "417", "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "455", "456", "454", "450", "476", "469", "470", "473", "474"]
+    "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_gyro_cal_config": {
     "owner": "sns_gyro_cal",

proprietary/vendor/etc/sensors/config/sns_mag_cal.json

@@ -1,8 +1,7 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "HDK", "IDP", "QRD", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "HDK", "IDP", "QRD"],
-    "soc_id": ["339", "355", "356", "361", "365", "366", "394", "400", "407", "417", "440", "415", "439", "416", "437", "444", "445", "420",
+    "soc_id": ["339", "355", "356", "361", "365", "366", "394", "400", "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
-    "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
   },
   "sns_mag_cal_config": {
     "owner": "sns_mag_cal",

proprietary/vendor/etc/sensors/config/sns_multishake.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_multishake": {
     "owner": "sns_multishake",

proprietary/vendor/etc/sensors/config/sns_pedometer.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_pedometer": {
     "owner": "sns_pedometer",

proprietary/vendor/etc/sensors/config/sns_rmd.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394",
-    "400", "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
+    "400", "407", "417", "440", "415", "439", "416", "437", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_rmd": {
     "owner": "sns_rmd",

proprietary/vendor/etc/sensors/config/sns_rotv.json

@@ -1,9 +1,9 @@
 {
   "config":
   {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400",
-    "407", "417", "440", "415", "439", "416", "437","444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
+    "407", "417", "440", "415", "439", "416", "437","444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_rotv_platform": {
     "owner": "sns_rotv",
@@ -12,7 +12,7 @@
       "min_report_rate": {
          "type": "flt", "ver": "0", "data": "1.0"
       },
-      "debug_mode": {
+      "coordinate_sys": {
         "type": "int", "ver": "0", "data": "0"
       },
       "sample_rate": {

proprietary/vendor/etc/sensors/config/sns_smd.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP", "IOT"],
+    "hw_platform": ["MTP", "Dragon", "Surf", "QRD", "HDK", "IDP"],
     "soc_id": ["291", "246", "300", "301", "305", "321", "336", "339", "341", "355", "356", "360", "361", "365", "366", "393", "347", "394", "400",
-    "407", "416", "417", "437", "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
+    "407", "416", "417", "437", "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_smd": {
     "owner": "sns_smd",

proprietary/vendor/etc/sensors/config/sns_tilt.json

@@ -1,8 +1,8 @@
 {
   "config": {
-    "hw_platform": [ "MTP", "Dragon", "Surf", "HDK", "IDP", "QRD", "IOT"],
+    "hw_platform": [ "MTP", "Dragon", "Surf", "HDK", "IDP", "QRD"],
     "soc_id": ["291", "246", "305", "321", "336", "339", "340", "341", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417",
-    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"]
+    "440", "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
   },
   "sns_tilt": {
     "owner": "sns_tilt",

proprietary/vendor/etc/sensors/config/sns_tilt_sw_disabled.json

@@ -1,7 +1,7 @@
 {
   "config": {
     "hw_platform": [ "MTP", "Dragon", "Surf", "HDK", "QRD"],
-    "soc_id": ["339", "340", "356", "361", "415", "439", "456"]
+    "soc_id": ["339", "340", "356", "361", "415", "439"]
   },
   "sns_tilt": {
     "owner": "sns_tilt",

proprietary/vendor/etc/sensors/config/sns_tilt_sw_enabled.json

@@ -1,8 +1,7 @@
 {
   "config": {
-    "hw_platform": [ "MTP", "Dragon", "Surf", "HDK", "IDP", "QRD", "IOT"],
+    "hw_platform": [ "MTP", "Dragon", "Surf", "HDK", "IDP", "QRD"],
-    "soc_id": ["291", "246", "305", "321", "336", "341", "355", "360", "365", "366", "393", "394", "400", "407", "417", "440", "444", "445", "420", "424", "443",
+    "soc_id": ["291", "246", "305", "321", "336", "341", "355", "360", "365", "366", "393", "394", "400", "407", "417", "440", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"]
-    "434", "435", "459", "441", "471", "454","450", "476", "469", "470", "473", "474"]
   },
   "sns_tilt": {
     "owner": "sns_tilt",

proprietary/vendor/etc/sensors/config/sns_tilt_to_wake.json

@@ -1,9 +1,9 @@
 {
   "config": {
-    "hw_platform": [ "MTP", "Dragon", "Surf", "IDP", "QRD", "IOT"
+    "hw_platform": [ "MTP", "Dragon", "Surf", "IDP", "QRD"
     ],
     "soc_id": ["291", "246", "305", "321", "336", "339", "355", "356", "360", "361", "365", "366", "393", "394", "400", "407", "417", "440",
-    "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471", "456", "454","450", "476", "469", "470", "473", "474"
+    "415", "439", "444", "445", "420", "424", "443", "434", "435", "459", "441", "471"
     ]
   },
   "sns_tilt_to_wake": {

proprietary/vendor/etc/sensors/config/tcs3408.json

@@ -1,10 +1,10 @@
 {
   "config":
   {
-    "hw_platform": ["MTP"],
+    "hw_platform": ["MTP", "Dragon", "Surf"],
-    "soc_id": ["356"]
+    "soc_id": ["291", "246", "356"]
   },
-  "tcs3408_common":{
+  "tcs3408":{
     "owner": "sns_tcs3408",
     ".als":{
       "owner": "sns_tcs3408",

proprietary/vendor/etc/sensors/config/tcs3701.json

@@ -1,8 +1,8 @@
 {
   "config":
   {
-    "hw_platform": ["MTP"],
+    "hw_platform": ["MTP", "Dragon", "Surf"],
-    "soc_id": ["400"]
+    "soc_id": ["356"]
   },
   "tcs3701":{
     "owner": "sns_tcs3701",

proprietary/vendor/etc/sensors/sns_reg_config

@@ -1,4 +1,4 @@
-version=8
+version=1
 file=hw_platform=/sys/devices/soc0/hw_platform
 file=platform_subtype=/sys/devices/soc0/platform_subtype
 file=platform_subtype_id=/sys/devices/soc0/platform_subtype_id
@@ -6,5 +6,7 @@ file=platform_version=/sys/devices/soc0/platform_version
 file=soc_id=/sys/devices/soc0/soc_id
 file=revision=/sys/devices/soc0/revision
 file=output=/mnt/vendor/persist/sensors/registry/registry
+file=project=/sys/project_info/project_name
+file=hw_id=/sys/project_info/hw_id
 property=persist.vendor.sensors.enable.property=/mnt/vendor/persist/sensors/registry/file1
 property=persist.vendor.sensors.enable.property1=/mnt/vendor/persist/sensors/registry/file2

proprietary/vendor/etc/sound_trigger_mixer_paths.xml

@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2020, 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    -->
-<!--- met:                                                                      -->
-<!---     * Redistributions of source code must retain the above copyright      -->
-<!---       notice, this list of conditions and the following disclaimer.       -->
-<!---     * Redistributions in binary form must reproduce the above             -->
-<!---       copyright notice, this list of conditions and the following         -->
-<!---       disclaimer in the documentation and/or other materials provided     -->
-<!---       with the distribution.                                              -->
-<!---     * Neither the name of The Linux Foundation nor the names of its       -->
-<!---       contributors may be used to endorse or promote products derived     -->
-<!---       from this software without specific prior written permission.       -->
-<!---                                                                           -->
-<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED              -->
-<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF      -->
-<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT    -->
-<!--- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS    -->
-<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    -->
-<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      -->
-<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR           -->
-<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     -->
-<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE      -->
-<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->
-<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->
-
-<mixer>
-    <!-- These are the initial mixer settings -->
-    <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM2 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM3 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM4 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM5 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM6 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM7 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM8 Mixer VA_CDC_DMA_TX_0" value="0" />
-    <ctl name="LSM1 Port" value="None" />
-    <ctl name="LSM2 Port" value="None" />
-    <ctl name="LSM3 Port" value="None" />
-    <ctl name="LSM4 Port" value="None" />
-    <ctl name="LSM5 Port" value="None" />
-    <ctl name="LSM6 Port" value="None" />
-    <ctl name="LSM7 Port" value="None" />
-    <ctl name="LSM8 Port" value="None" />
-    <ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
-    <ctl name="VA_AIF1_CAP Mixer DEC0" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC1" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC2" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC3" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC4" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC5" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC6" value="0" />
-    <ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />
-    <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC4 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC5 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC6 MUX" value="MSM_DMIC" />
-    <ctl name="VA DEC7 MUX" value="MSM_DMIC" />
-    <ctl name="VA DMIC MUX0" value="ZERO" />
-    <ctl name="VA DMIC MUX1" value="ZERO" />
-    <ctl name="VA DMIC MUX2" value="ZERO" />
-    <ctl name="VA DMIC MUX3" value="ZERO" />
-    <ctl name="VA DMIC MUX4" value="ZERO" />
-    <ctl name="VA DMIC MUX5" value="ZERO" />
-    <ctl name="VA DMIC MUX6" value="ZERO" />
-    <ctl name="VA DMIC MUX7" value="ZERO" />
-    <ctl name="VA SMIC MUX0" value="ZERO" />
-    <ctl name="VA SMIC MUX1" value="ZERO" />
-    <ctl name="VA SMIC MUX2" value="ZERO" />
-    <ctl name="VA SMIC MUX3" value="ZERO" />
-    <ctl name="VA SMIC MUX4" value="ZERO" />
-    <ctl name="VA SMIC MUX5" value="ZERO" />
-    <ctl name="VA SMIC MUX6" value="ZERO" />
-    <ctl name="VA SMIC MUX7" value="ZERO" />
-    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None"/>
-    <ctl name="EC Reference Channels" value="Zero"/>
-    <ctl name="EC Reference Bit Format" value="0"/>
-    <ctl name="EC Reference SampleRate" value="0"/>
-    <ctl name="ADC2_MIXER Switch" value="0" />
-    <ctl name="LPI Enable" value="0" />
-    <ctl name="ADC2 Volume" value="12" />
-    <ctl name="VA_DEC0 MODE" value="ADC_DEFAULT" />
-    <ctl name="ADC2_BCS Disable" value="0" />
-
-    <path name="listen-voice-wakeup-1">
-        <ctl name="LSM1 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-2">
-        <ctl name="LSM2 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-3">
-        <ctl name="LSM3 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-4">
-        <ctl name="LSM4 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-5">
-        <ctl name="LSM5 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-6">
-        <ctl name="LSM6 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-7">
-        <ctl name="LSM7 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-8">
-        <ctl name="LSM8 Mixer VA_CDC_DMA_TX_0" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-1 preproc">
-        <path name="listen-voice-wakeup-1" />
-    </path>
-
-    <path name="listen-voice-wakeup-2 preproc">
-        <path name="listen-voice-wakeup-2" />
-    </path>
-
-    <path name="listen-voice-wakeup-3 preproc">
-        <path name="listen-voice-wakeup-3" />
-    </path>
-
-    <path name="listen-voice-wakeup-4 preproc">
-        <path name="listen-voice-wakeup-4" />
-    </path>
-
-    <path name="listen-voice-wakeup-5 preproc">
-        <path name="listen-voice-wakeup-5" />
-    </path>
-
-    <path name="listen-voice-wakeup-6 preproc">
-        <path name="listen-voice-wakeup-6" />
-    </path>
-
-    <path name="listen-voice-wakeup-7 preproc">
-        <path name="listen-voice-wakeup-7" />
-    </path>
-
-    <path name="listen-voice-wakeup-8 preproc">
-        <path name="listen-voice-wakeup-8" />
-    </path>
-
-    <path name="listen-voice-wakeup-1 port">
-        <ctl name="LSM1 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-2 port">
-        <ctl name="LSM2 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-3 port">
-        <ctl name="LSM3 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-4 port">
-        <ctl name="LSM4 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-5 port">
-        <ctl name="LSM5 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-6 port">
-        <ctl name="LSM6 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-7 port">
-        <ctl name="LSM7 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-8 port">
-        <ctl name="LSM8 Port" value="VA_CDC_DMA_TX_0" />
-        <ctl name="LPI Enable" value="1" />
-        <ctl name="ADC2_BCS Disable" value="1" />
-    </path>
-
-    <path name="listen-voice-wakeup-1 preproc port">
-        <ctl name="LSM1 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-2 preproc port">
-        <ctl name="LSM2 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-3 preproc port">
-        <ctl name="LSM3 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-4 preproc port">
-        <ctl name="LSM4 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-5 preproc port">
-        <ctl name="LSM5 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-6 preproc port">
-        <ctl name="LSM6 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-7 preproc port">
-        <ctl name="LSM7 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-voice-wakeup-8 preproc port">
-        <ctl name="LSM8 Port" value="ADM_LSM_TX" />
-        <ctl name="LPI Enable" value="0" />
-        <ctl name="ADC2_BCS Disable" value="0" />
-    </path>
-
-    <path name="listen-ape-handset-mic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="SWR_DMIC2" />
-        <ctl name="DMIC3_MIXER Switch" value="1" />
-    </path>
-
-    <path name="listen-ape-handset-mic-preproc">
-        <path name="listen-ape-handset-mic" />
-    </path>
-
-    <path name="listen-ape-handset-dmic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA DEC1 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="SWR_DMIC0" />
-        <ctl name="VA SMIC MUX1" value="SWR_DMIC2" />
-        <ctl name="DMIC1_MIXER Switch" value="1" />
-        <ctl name="DMIC3_MIXER Switch" value="1" />
-    </path>
-
-    <path name="listen-ape-handset-tmic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC4" />
-        <ctl name="VA DMIC MUX1" value="DMIC0" />
-        <ctl name="VA DMIC MUX2" value="DMIC1" />
-    </path>
-
-    <path name="listen-ape-handset-qmic">
-        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four" />
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
-        <ctl name="VA_AIF1_CAP Mixer DEC3" value="1" />
-        <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
-        <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
-        <ctl name="VA DMIC MUX0" value="DMIC4" />
-        <ctl name="VA DMIC MUX1" value="DMIC0" />
-        <ctl name="VA DMIC MUX2" value="DMIC1" />
-        <ctl name="VA DMIC MUX3" value="DMIC2" />
-    </path>
-
-    <path name="listen-ape-headset-mic">
-        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
-        <ctl name="VA DEC0 MUX" value="SWR_MIC" />
-        <ctl name="VA SMIC MUX0" value="ADC1" />
-        <ctl name="ADC2_MIXER Switch" value="1" />
-        <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" />
-        <ctl name="ADC2 MUX" value="INP2" />
-    </path>
-
-    <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_MI2S_RX"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
-        <ctl name="EC Reference SampleRate" value="48000"/>
-    </path>
-
-    <path name="echo-reference headset">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0"/>
-        <ctl name="EC Reference Channels" value="One"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
-        <ctl name="EC Reference SampleRate" value="48000"/>
-    </path>
-
-    <path name="echo-reference a2dp">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX"/>
-        <ctl name="EC Reference Channels" value="Two"/>
-        <ctl name="EC Reference Bit Format" value="S16_LE"/>
-        <ctl name="EC Reference SampleRate" value="48000"/>
-    </path>
-
-</mixer>