Snap for 11800966 from e06e840d52 to 24Q3-release

Change-Id: I11f8201815bda6313b3e8f5cf5e0662c3e6b4382

audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -134,10 +134,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -157,8 +153,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -130,10 +130,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -153,8 +149,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

audio/comet/config/audio_policy_configuration_le_offload_disabled.xml

@@ -134,10 +134,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                 </devicePort>
-                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -157,8 +153,6 @@
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                 </devicePort>
-                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
-                </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

conf/init.comet.rc

@@ -77,6 +77,7 @@ on property:vendor.thermal.link_ready=1
 
 # ODPM
 on early-boot && property:ro.boot.hardware.sku=GC15S
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
     write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 
 # SFPS Fingerprint

location/user/gps.cfg

@@ -53,7 +53,7 @@ GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=0x5
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
-CP_LocTech_Constraints=0x81
+CP_LocTech_Constraints=1
 CP_LocTech_Requirements=0
 UP_LocTech_PrimaryConst=0
 UP_LocTech_Constraints=1

location/userdebug/gps.cfg

@@ -179,7 +179,7 @@ GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=0x5
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
-CP_LocTech_Constraints=0x81
+CP_LocTech_Constraints=1
 CP_LocTech_Requirements=0
 UP_LocTech_PrimaryConst=0
 UP_LocTech_Constraints=1

powerhint-comet.json

@@ -221,6 +221,7 @@
         "0x0",
         "0x80"
       ],
+      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -843,12 +844,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 5000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "ReducePreferIdle",
@@ -1109,12 +1104,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH_EXTEND",
-      "Node": "CPUSkipMask",
-      "Duration": 2000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -1276,12 +1265,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "CPUSkipMask",
-      "Duration": 1000,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1858,12 +1841,6 @@
       "Duration": 0,
       "Value": "camera"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -2248,12 +2225,6 @@
       "Duration": 0,
       "Value": "4-7"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PowerHALCameraRunning",
@@ -2392,12 +2363,6 @@
       "Duration": 0,
       "Value": "30"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUSkipMask",
-      "Duration": 0,
-      "Value": "0x0"
-    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",

thermal/thermal_info_config_comet.json

@@ -261,10 +261,6 @@
             "PassiveDelay": 7000,
             "SendCallback": true,
             "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
-                },
                 {
                     "CdevRequest": "gxp-cooling",
                     "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
@@ -556,7 +552,7 @@
             ]
         },
         {
-            "Name": "VIRTUAL-SKIN-CPU-GPU",
+            "Name": "VIRTUAL-SKIN-SOC",
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
@@ -576,7 +572,7 @@
                 "K_D": ["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
                 "I_Max": ["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"],
                 "S_Power": ["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
-                "MinAllocPower": ["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+                "MinAllocPower": ["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
                 "MaxAllocPower": ["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
                 "I_Cutoff": ["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
             },
@@ -607,7 +603,6 @@
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
                     "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000],
                     "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000]
-         
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -617,6 +612,15 @@
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "CdevCeiling": [0, 9, 9, 9, 10, 12, 12],
                     "LimitInfo": [0, 0, 0, 0, 0, 12, 12]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S7M_VDD_TPU",
+                    "CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
+                    "LimitInfo": [0, 0, 0, 0, 0, 7, 7]
                 }
             ]
         },
@@ -1090,6 +1094,11 @@
             "PowerSampleDelay": 7000,
             "PowerSampleCount": 1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name": "PARTIAL_SYSTEM_POWER",
             "VirtualRails": true,