From 7b857c0da992d4229e7926622cfbb51fdd1a87be Mon Sep 17 00:00:00 2001 From: Jason Hsu Date: Fri, 11 Oct 2024 14:45:16 +0800 Subject: [PATCH 1/2] audio: 2024/10/11 Fortemedia table check in for next release Fortemedia tables => /vendor/etc/aoc CM4 (Duncan) --Handsfree 1: HHSWB TX TDDRC noise gate for low volume noise floor 2: HHWB TX TDDRC noise gate for low volume noise floor Bug: 372825276 Flag: EXEMPT bugfix Test: verify by Acoustic team Change-Id: I3dc7b6746b13e0faf1b994437b572ae02e7d2f38 Signed-off-by: Jason Hsu --- audio/caiman/tuning/fortemedia/BLUETOOTH.dat | Bin 279682 -> 279682 bytes audio/caiman/tuning/fortemedia/BLUETOOTH.mods | 10 +++++----- audio/caiman/tuning/fortemedia/HANDSET.mods | 2 +- audio/caiman/tuning/fortemedia/HANDSFREE.dat | Bin 118342 -> 118342 bytes audio/caiman/tuning/fortemedia/HANDSFREE.mods | 14 +++++++------- audio/caiman/tuning/fortemedia/HEADSET.dat | Bin 430266 -> 430266 bytes audio/caiman/tuning/fortemedia/HEADSET.mods | 18 +++++++++--------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/audio/caiman/tuning/fortemedia/BLUETOOTH.dat b/audio/caiman/tuning/fortemedia/BLUETOOTH.dat index fb015419ebd58cc1230226d70d1e24ba3a7338e6..1dedfa590fa4714732250233510b0bea44ebb30c 100644 GIT binary patch delta 110 zcmZqb6m04g+%PSXm4P9QdBWz|iOeBz=46@ac4~|~+q24;erST3)1%HYicGI7W8&G~ zw}9yY|Ma*BW{2&48<^fOZh!ZXQGs*&y@!k)jNAEMGrI7$12qFN6A&|Rw^L(rkploc CX(f9A delta 110 zcmZqb6m04g+%PSXm60KgnQ8OvMCK4UbF$2IJ2gh0?OA0^KQzJ2=~3qxMW)x4G4X8g zTflUHe|lU5v%~hj4NPwsx4(PHsKB}X-b2O?#_fEs8C`hWftrDs35c1u+o`d*$N>P@ Cu_R#t diff --git a/audio/caiman/tuning/fortemedia/BLUETOOTH.mods b/audio/caiman/tuning/fortemedia/BLUETOOTH.mods index ff86e942..df0a6b40 100644 --- a/audio/caiman/tuning/fortemedia/BLUETOOTH.mods +++ b/audio/caiman/tuning/fortemedia/BLUETOOTH.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG BLUETOOTH #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-07-23 15:16:17 +#SAVE_TIME 2024-10-11 14:08:41 #CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -6253,8 +6253,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -11643,8 +11643,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 diff --git a/audio/caiman/tuning/fortemedia/HANDSET.mods b/audio/caiman/tuning/fortemedia/HANDSET.mods index 638d3379..d8fabe15 100644 --- a/audio/caiman/tuning/fortemedia/HANDSET.mods +++ b/audio/caiman/tuning/fortemedia/HANDSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSET #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-07-23 15:15:40 +#SAVE_TIME 2024-10-11 14:07:45 #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX diff --git a/audio/caiman/tuning/fortemedia/HANDSFREE.dat b/audio/caiman/tuning/fortemedia/HANDSFREE.dat index 32e7bc6de66d7754ed258386507b93e61dd1c7a8..3c75fcb74d53a323afd85f5f03676b4d750498fa 100644 GIT binary patch delta 51 zcmX>$hyBvq delta 49 zcmX>$hyB<~bD#`!= delta 118 zcmdnBP-@pgsfHHDElm4ZSs59^n3=Z!uVztZ+WzY%(;24i^DG#bh)?%B$H+6i>lic7 x_B Date: Fri, 18 Oct 2024 21:45:27 +0800 Subject: [PATCH 2/2] Modify TARGET_LINUX_KERNEL_VERSION according to build flags Bug: 374029508 Bug: 357775261 Flag: build.RELEASE_KERNEL_CAIMAN_VERSION Flag: build.RELEASE_KERNEL_KOMODO_VERSION Flag: build.RELEASE_KERNEL_TOKAY_VERSION Change-Id: I0e96ce4cd4ce3768c0fcbb04db8fcd3a28077ae0 --- device-caiman.mk | 6 ++++++ device-komodo.mk | 6 ++++++ device-tokay.mk | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index 8d4372ab..07d660d9 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/32711900 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)) +ifdef RELEASE_KERNEL_CAIMAN_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CAIMAN_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_CAIMAN_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers diff --git a/device-komodo.mk b/device-komodo.mk index 8173c405..6d575ecf 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/32711900 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)) +ifdef RELEASE_KERNEL_KOMODO_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_KOMODO_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_KOMODO_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers diff --git a/device-tokay.mk b/device-tokay.mk index 6799ec60..1bd27184 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)) +ifdef RELEASE_KERNEL_TOKAY_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TOKAY_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_TOKAY_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers