From d1b167f396ddcdb47eaa8c48935fc2629fad91e3 Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Fri, 16 Sep 2022 11:31:17 +0800 Subject: [PATCH 1/3] wifi: Add flag BOARD_WLAN_CHIP Need a flag other than TARGET_DEVICE to identify which WifiHal subfolder we want to use. Bug: 246974867 Test: Build pass Change-Id: Idf1a7af8e52a235e0491f6fb9ab09a4c37fe5713 --- wifi/qcom/BoardConfig-wifi.mk | 1 + 1 file changed, 1 insertion(+) 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 From 7d7c776e0a495c01edcfe221034ad2bb99978c4c Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 22 Jul 2022 10:10:36 -0700 Subject: [PATCH 2/3] Revert "thermal: Fix misalignment from removal of gxp cdev" This reverts commit baedb92abfa4f38738daec010b3ce357ff88f4ed. Re-enable gxp cooling device Bug: 238273184 Test: build and boot on device Signed-off-by: Sayanna Chandula Change-Id: I341636bc5e7d8feced4593fdbd2638c244051499 --- battery_mitigation/battery_mitigation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index 921436f5..06f739c2 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -56,7 +56,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", From 44f40fe147aa0a6cd9490936d2b55e4ca225ea4a Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 22 Jul 2022 10:11:43 -0700 Subject: [PATCH 3/3] Revert "thermal: remove gxp cooling device dependency" This reverts commit 617f8719f5bd7268b74157ab23cc0bafcb4f2cfc. Re-enable gxp cooling device Bug: 238273184 Test: build and boot on device Signed-off-by: Sayanna Chandula Change-Id: I3787c11e674b6781b81d01aad2abc88d99c1d1d0 --- battery_mitigation/battery_mitigation.cpp | 1 + conf/init.gs201.rc | 1 + 2 files changed, 2 insertions(+) diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index 06f739c2..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", }, 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