From 3eaf856d006c2ada33285f856b938cd096355155 Mon Sep 17 00:00:00 2001 From: Samuel Gosselin Date: Wed, 31 May 2023 19:58:20 +0000 Subject: [PATCH 1/3] Fix the source paths of the bluetooth csv files. The source files currently referenced with LOCAL_PATH, which is not always correctly set. This results in build failures for the 6.1 kernel based pantah targets (i.e., bluetooth power files not found). Fix the paths by using the fullpath from the AOSP root. Test: - CI for GS201 targets - Locally built lunch combo for GS201 targets on 6.1 kernel. Bug: 277993984 Change-Id: If260be60649d1c82fabbb5eac2a8f72f790b8024 Signed-off-by: Samuel Gosselin --- device-cheetah.mk | 14 +++++++------- device-panther.mk | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index bc3c72e..2a2d55d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -161,13 +161,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GFE4J_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GFE4J_JP.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GP4BC_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_CA.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GE2AE_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GP4BC_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GE2AE_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_US.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GP4BC_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_US.csv + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GFE4J_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GFE4J_JP.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_CA.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GE2AE_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GE2AE_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_US.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_US.csv # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ diff --git a/device-panther.mk b/device-panther.mk index 83a8a37..d55a7e2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -146,13 +146,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_G03Z5_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G03Z5_JP.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GVU6C_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_CA.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GQML3_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GVU6C_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GQML3_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_US.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GVU6C_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_US.csv + device/google/pantah/bluetooth/bluetooth_power_limits_panther.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_G03Z5_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G03Z5_JP.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_CA.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GQML3_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GQML3_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_US.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_US.csv # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ From dd47a275be002e81cb26a5b1e11f89db22cff382 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 17:34:57 +0800 Subject: [PATCH 2/3] Update cs40l26 modprobe modules Bug: 278018625 Test: Driver probed and checked lsmod. Change-Id: Ia60b72f9a03853b0d67cd50b550bc831fa663c1a --- init.insmod.cheetah.cfg | 3 +-- init.insmod.cloudripper.cfg | 3 +-- init.insmod.panther.cfg | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/init.insmod.cheetah.cfg b/init.insmod.cheetah.cfg index 7487e1e..5a38650 100644 --- a/init.insmod.cheetah.cfg +++ b/init.insmod.cheetah.cfg @@ -9,8 +9,7 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|syna_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded diff --git a/init.insmod.cloudripper.cfg b/init.insmod.cloudripper.cfg index 4d6ab6f..aa7bab4 100644 --- a/init.insmod.cloudripper.cfg +++ b/init.insmod.cloudripper.cfg @@ -10,8 +10,7 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-i2c.ko modprobe|ftm5.ko modprobe|sec_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded diff --git a/init.insmod.panther.cfg b/init.insmod.panther.cfg index c82a69e..1a07eff 100644 --- a/init.insmod.panther.cfg +++ b/init.insmod.panther.cfg @@ -9,8 +9,7 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|focal_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded From 17eaf1af2a0c360e47d2b14a1ce1c6afaf4e7c9f Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 16:14:46 +0800 Subject: [PATCH 3/3] Revert "haptics: update hapitcs sink and slot setting" This reverts commit 8b8cf4cab44f2d6e8d3781b0c52e72677c0427b4. Bug: 278018625 Test: Check audio coupled haptics at the sound preview app. Change-Id: Ifa4f55c0b2de85bee9cc4c3e1a642c54cf5ea44a --- audio/cheetah/config/mixer_paths.xml | 2 +- audio/cloudripper/config/mixer_paths.xml | 4 ++-- audio/panther/config/mixer_paths.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml index ef62bb6..153f117 100644 --- a/audio/cheetah/config/mixer_paths.xml +++ b/audio/cheetah/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml index 1798e49..c39cbfa 100644 --- a/audio/cloudripper/config/mixer_paths.xml +++ b/audio/cloudripper/config/mixer_paths.xml @@ -37,8 +37,8 @@ - - + + diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml index ef62bb6..153f117 100644 --- a/audio/panther/config/mixer_paths.xml +++ b/audio/panther/config/mixer_paths.xml @@ -42,7 +42,7 @@ - +