From 3a50fbbc5339a1ad43655150612e299173a7665d Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 20 Apr 2022 17:51:28 +0800 Subject: [PATCH 1/3] audio: rename spk module config Bug: 204271052 Test: voip + speaker mode Signed-off-by: Jasmine Cha Change-Id: I6aa0da65a1b1faa8be26ae8eb77a01b14d277666 --- audio/cheetah/config/audio_platform_configuration.xml | 2 +- audio/panther/config/audio_platform_configuration.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml index 88c1026..e8faf44 100644 --- a/audio/cheetah/config/audio_platform_configuration.xml +++ b/audio/cheetah/config/audio_platform_configuration.xml @@ -284,7 +284,7 @@ - + diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml index 88c1026..e8faf44 100644 --- a/audio/panther/config/audio_platform_configuration.xml +++ b/audio/panther/config/audio_platform_configuration.xml @@ -284,7 +284,7 @@ - + From 74b13c4c45803121c38d3195b887cab97efd20f3 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Fri, 22 Apr 2022 11:55:04 +0800 Subject: [PATCH 2/3] audio: update FM tuning 0422 FM table Changelist: 1. C10 HA NB/WB/SWB: fine tuning for EVT1.1 2. C10 HA NB/WB/SWB: FFP parameter update (enable) Bug: 216258666 Test: Acoustic team verified Signed-off-by: Carter Hsu Change-Id: Ia4dcb8dd19d4aaf7fa4150a3cdacb9d455994ac6 --- audio/cheetah/tuning/fortemedia/HANDSET.dat | Bin 255674 -> 255674 bytes audio/cheetah/tuning/fortemedia/HANDSET.mods | 1336 +++++++++--------- 2 files changed, 668 insertions(+), 668 deletions(-) diff --git a/audio/cheetah/tuning/fortemedia/HANDSET.dat b/audio/cheetah/tuning/fortemedia/HANDSET.dat index 44d956e0c85eebe410b4ae71ce1d82f15a1527e7..c84c985c248320b94706ad1f49c688ee95e2ecf0 100644 GIT binary patch delta 4319 zcmeH}Ur1A77{>kHGfZdcE{27ONSOKGX;C8Xc$`z0&TY&_MHf@wB)4Uf z)+x6nZ2k|4u#WN3=+Cf=VC0Q=T?LjA1qxkwQ8yhWiNJ7l#x7#_9}my_z0ddk9^Z0; zZ#iM%`#`)#Qvw=|8jcsUke)5XI2=T7sF?thaS|HLg2#DXM$&||p-pnYr0m5gSszC2 zLzMFy#cvK*$n2<$N=Ht26gf5nZFQO0eK8ANj%@6`nuC|^f?~Lx1a~f)@Z&dIgE^ae zD|k(El7C;)5{#%tu9biBf*;n$t}h0(_zASNMyafFB)@ju-p^4}Zb{WQRS zWbBx{vkoo;8!E+hoXf)gUU40c9K6z#iwqY%68$I#Tln|xpR zC(l|X$_OT3HIb;XZDr}XWGk&NLStp+m1HYj{?J&7uT%)%mbk=1lePp-ThyR$XTe-m z3T6Wb^_DVdv}(X$DF=&H3s!vvxVkGr-%$lRz1x3}sTLl+J48~dPfdWnW)cjwQ(!hu zLz86&+L~vfy>kv&3+2X{Pe2CgMlG`yHi|~(kF>e5jtQLDid(7}H&%T8toZs3Y$kR# ziE+bh?7x57L=O=ZhdH=>14>_q~QVx_%dA zv7zPPoXEdqDylQF;f3I(r0tpbK&Fyfy`(3T(nKbFCL)#cZ?*V;s+1(2Z?2D{Hja5a K5Z-uqB>ee8znGDSAnAFrabF{TFa`|{KWb*S}#1!bic}9CT3!}nj zm7Z^mybpxy8X6et8yFNC8n`CEw>qvA&sx(U!l2gR;Gy2&V5iX#<*V6{lc3d5Q>NWe zR-w~SQL$N|KaG(%b!?22=S@r?My~0GX8%HKHGbbiHTW2N@*U2(%ew*1gs4&XGgF9d`Q)tiamuPuV?VscDdbMTmn& zL#P`hLduG?8>*^w8X9YL8`|3S8hU#48>Vy_G_*`JZ0M>oYRD)sZU{)29I)%v&tKrsv~g!xS7~%jA({ z$K>T~&*bajz~t@Y$mHec#N_1R%;e(Z!sKP;%2bi!#^ez(U7?uSZ}YmF5{%nlc`>sv zGrrmW-j_L=#jqZji4}lp#txW??SPrs%TBW)B}A*Cr~sIWTXh;5Ds&qf2%4GQm&YNdF5@94y>-JSz%;f6byy_{rS|`tXw1v@Vvj5|F@|?YS*9&s3-hRq} zd>@~By}*G$DZQOTkC97*+U3mlZBdMGRH%~5`Wd&MYGoAgCE$IPeT09f5@zr@cpTHlaZLk`jUX8S4&CZZ~w-*VII4>NIZe>anf zg_9O_&r9j;Kns{TsaOLQN`c)x`IM%}_NWDnwVK Date: Fri, 22 Apr 2022 01:36:32 +0000 Subject: [PATCH 3/3] thermal: enable thermal engine for evt1.0 devices New version of thermal engine (Powerlink v2) uses ODPM data for thermal mitigation. But proto devices does not support ODPM. Currently we have disabled thermal mitigation for all A0 based devices through a separate config, thermal_info_config_A0.json. This change restricts using separate thermal config only for the proto devices and uses thermal_info_config.json for the rest. Fix a format issue with qi-quiet sensor definition. Bug: 196478280 Test: Build and boot on device. Check thermal config Signed-off-by: Sayanna Chandula Change-Id: I0922e935cafe118f3437335e2a72b87aae6f6009 --- conf/init.pantah.rc | 6 ++++++ device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- thermal_info_config_panther.json | 2 +- ...al_info_config_A0.json => thermal_info_config_proto.json | 0 7 files changed, 11 insertions(+), 5 deletions(-) rename thermal_info_config_A0.json => thermal_info_config_proto.json (100%) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 697aca9..2b1408d 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -82,6 +82,12 @@ on property:persist.vendor.se.ese2.mode=ctsmode on init && property:ro.boot.hw.soc.rev=0 setprop vendor.powerhal.config powerhint-a0.json +on property:ro.boot.hardware.revision=PROTO1.0 + setprop vendor.thermal.config "thermal_info_config_proto.json" + +on property:ro.boot.hardware.revision=PROTO1.1 + setprop vendor.thermal.config "thermal_info_config_proto.json" + # Touch on property:vendor.device.modules.ready=1 chown system system /proc/focaltech_touch/Channel_Num diff --git a/device-cheetah.mk b/device-cheetah.mk index cbf2a9f..0a84055 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -110,7 +110,7 @@ DEVICE_MANIFEST_FILE += \ # Thermal Config PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_cheetah.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ - device/google/pantah/thermal_info_config_A0.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_A0.json + device/google/pantah/thermal_info_config_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 72d6a7b..0356a70 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -80,7 +80,7 @@ DEVICE_MANIFEST_FILE += \ # Thermal Config PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ - device/google/pantah/thermal_info_config_A0.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_A0.json + device/google/pantah/thermal_info_config_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/device-panther.mk b/device-panther.mk index fa17108..f390c44 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -98,7 +98,7 @@ DEVICE_MANIFEST_FILE += \ # Thermal Config PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_panther.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ - device/google/pantah/thermal_info_config_A0.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_A0.json + device/google/pantah/thermal_info_config_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index c922dc5..e4d9223 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -85,7 +85,7 @@ DEVICE_MANIFEST_FILE += \ # Thermal Config PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_ravenclaw.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ - device/google/pantah/thermal_info_config_A0.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_A0.json + device/google/pantah/thermal_info_config_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index f51b057..1c0ff89 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -107,7 +107,7 @@ "Formula":"WEIGHTED_AVG", "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.3, 0.7], - "Offset":-1400, + "Offset":-1400 }, { "Name":"VIRTUAL-QI-DISP", diff --git a/thermal_info_config_A0.json b/thermal_info_config_proto.json similarity index 100% rename from thermal_info_config_A0.json rename to thermal_info_config_proto.json