diff --git a/base.mk b/base.mk
index 5f40d5943cdf79f450be834741bdfd7924a82144..96bc6d76f6366da5a813adacc671eafea23e0bcf 100644
--- a/base.mk
+++ b/base.mk
@@ -46,6 +46,7 @@ QCOM_BOARD_PLATFORMS += lagoon
QCOM_BOARD_PLATFORMS += $(TRINKET)
LIBHDMI_CEC := hdmi_cec.msm8998
+LIBHDMI_CEC += hdmi_cec.qcs605
QSD8K_BOARD_PLATFORMS := qsd8k
diff --git a/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index f85423e35e0a7a25745286e08af8b79cda819e55..780589b5e754835b65e5010a5b520e34e97650d7 100644
--- a/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -1385,7 +1385,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="support_cancel_modify_call" value="true" />
<boolean name="config_enable_video_crbt" value="true" />
<boolean name="config_hide_vt_callforward_option" value="true" />
- <boolean name="disable_filter_out_conference_host" value="true" />
<boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
<boolean name="ignore_reset_ut_capability_bool" value="true" />
<boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
@@ -1464,7 +1463,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="support_cancel_modify_call" value="true" />
<boolean name="config_enable_video_crbt" value="true" />
<boolean name="config_hide_vt_callforward_option" value="true" />
- <boolean name="disable_filter_out_conference_host" value="true" />
<boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
<boolean name="ignore_reset_ut_capability_bool" value="true" />
<boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
@@ -1605,7 +1603,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="support_cancel_modify_call" value="true" />
<boolean name="config_enable_video_crbt" value="true" />
<boolean name="config_hide_vt_callforward_option" value="true" />
- <boolean name="disable_filter_out_conference_host" value="true" />
<boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
<boolean name="ignore_reset_ut_capability_bool" value="true" />
<boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
@@ -1653,7 +1650,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="support_cancel_modify_call" value="true" />
<boolean name="config_enable_video_crbt" value="true" />
<boolean name="config_hide_vt_callforward_option" value="true" />
- <boolean name="disable_filter_out_conference_host" value="true" />
<boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
<boolean name="ignore_reset_ut_capability_bool" value="true" />
<boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
@@ -1763,6 +1759,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
<boolean name="config_disable_clir_over_ut" value="true" />
</carrier_config>
+ <carrier_config mcc="460" mnc="15">
+ <boolean name="carrier_volte_available_bool" value="true" />
+ <boolean name="carrier_vt_available_bool" value="true" />
+ <boolean name="carrier_wfc_ims_available_bool" value="true" />
+ </carrier_config>
+
<carrier_config mcc="310" mnc="00">
<boolean name="rtt_supported_bool" value="true" />
<boolean name="carrier_rtt_auto_upgrade" value="true" />
diff --git a/rootdir/etc/init.qcom.debug.sh b/rootdir/etc/init.qcom.debug.sh
index 8118c318f5aea0f33d29b6e1ab3d49b84bde0041..aa20c6ec26e5200c56cabf85aea990611fdb5b8f 100644
--- a/rootdir/etc/init.qcom.debug.sh
+++ b/rootdir/etc/init.qcom.debug.sh
@@ -2587,7 +2587,7 @@ case "$coresight_config" in
;;
"bengal")
soc_id=`cat /sys/devices/soc0/soc_id`
- if [ "$soc_id" == "441" ]; then
+ if [[ "$soc_id" == "441" || "$soc_id" == "471" ]]; then
echo "Enabling DCC/STM/Debug events for scuba"
enable_scuba_debug
setprop ro.dbg.coresight.stm_cfg_done 1
diff --git a/rootdir/etc/init.qcom.post_boot.sh b/rootdir/etc/init.qcom.post_boot.sh
index ecb44da7a9044c248b19f98e05e9b4f1cab12f20..5bb0074a7e4c57afd0edf6f83b2001d51f2c2ad0 100644
--- a/rootdir/etc/init.qcom.post_boot.sh
+++ b/rootdir/etc/init.qcom.post_boot.sh
@@ -737,9 +737,9 @@ else
echo 1 > /sys/module/lowmemorykiller/parameters/oom_reaper
fi
- if [ "$ProductName" != "bengal_32" ]; then
- #bengal_32 has appcompaction enabled. So not needed
- # Set PPR parametersi for other targets
+ if [[ "$ProductName" != "bengal"* ]]; then
+ #bengal has appcompaction enabled. So not needed
+ # Set PPR parameters for other targets
if [ -f /sys/devices/soc0/soc_id ]; then
soc_id=`cat /sys/devices/soc0/soc_id`
else
@@ -3077,7 +3077,7 @@ case "$target" in
fi
case "$soc_id" in
- "394" )
+ "394" | "467" | "468" )
# Core control parameters on big
echo 2 > /sys/devices/system/cpu/cpu4/core_ctl/min_cpus
@@ -4039,6 +4039,10 @@ case "$target" in
echo -6 > /sys/devices/system/cpu/cpu3/sched_load_boost
echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load
+ # configure input boost settings
+ echo "0:1017600" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+ echo 80 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
+
# Set Memory parameters
configure_memory_parameters
diff --git a/rootdir/etc/init.qti.debug-scuba.sh b/rootdir/etc/init.qti.debug-scuba.sh
index a8021c731fe7315f9ec12f56dd8c13e1700a5935..92e56443cb930f442f6aea39e8db6d5ef76e8888 100644
--- a/rootdir/etc/init.qti.debug-scuba.sh
+++ b/rootdir/etc/init.qti.debug-scuba.sh
@@ -127,6 +127,9 @@ enable_scuba_stm_events()
fi
echo $etr_size > /sys/bus/coresight/devices/coresight-tmc-etr/buffer_size
+ if uname -m | grep "armv7l"; then
+ echo 0x1000000 > /sys/bus/coresight/devices/coresight-tmc-etr/buffer_size
+ fi
echo 1 > /sys/bus/coresight/devices/coresight-tmc-etr/$sinkenable
echo 1 > /sys/bus/coresight/devices/coresight-stm/$srcenable
echo 1 > /sys/kernel/debug/tracing/tracing_on