diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index 921436f5..5784b270 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -44,6 +44,7 @@ const struct MitigationConfig::Config cfg = { "/dev/thermal/cdev-by-name/tpu_cooling/cur_state", "/dev/thermal/cdev-by-name/CAM/cur_state", "/dev/thermal/cdev-by-name/DISP/cur_state", + "/dev/thermal/cdev-by-name/gxp-cooling/cur_state", "/sys/class/power_supply/battery/voltage_now", "/sys/class/power_supply/battery/current_now", }, @@ -56,7 +57,7 @@ const struct MitigationConfig::Config cfg = { .SystemName = { "batoilo", "smpl_gm", "soc", "vdroop1", "vdroop2", "ocp_gpu", "ocp_tpu", "soft_ocp_cpu2", "soft_ocp_cpu1", "battery", "battery_cycle", - "main", "sub", "CPU2", "CPU1", "GPU", "TPU", "CAM", "DISP", + "main", "sub", "CPU2", "CPU1", "GPU", "TPU", "CAM", "DISP", "NPU", "voltage_now", "current_now", }, .LogFilePath = "/data/vendor/mitigation/thismeal.txt", diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index cb883128..b38985c9 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -960,6 +960,7 @@ on property:vendor.thermal.link_ready=1 chmod 664 /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote chown system system /dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote chmod 664 /dev/thermal/cdev-by-name/tpu_cooling/user_vote + chown system system /dev/thermal/cdev-by-name/gxp-cooling/user_vote chown system system /dev/thermal/cdev-by-name/tpu_cooling/user_vote chmod 664 /dev/thermal/cdev-by-name/fcc/cur_state chown system system /dev/thermal/cdev-by-name/fcc/cur_state diff --git a/wifi/qcom/BoardConfig-wifi.mk b/wifi/qcom/BoardConfig-wifi.mk index dd2455ac..dcc75a9c 100644 --- a/wifi/qcom/BoardConfig-wifi.mk +++ b/wifi/qcom/BoardConfig-wifi.mk @@ -18,6 +18,7 @@ LOCAL_WIFI_PATH := device/google/gs201/wifi/qcom # wlan flags BOARD_WLAN_DEVICE := qcwcn +BOARD_WLAN_CHIP := wcn6740 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_WPA_SUPPLICANT_DRIVER := NL80211