From dd47a275be002e81cb26a5b1e11f89db22cff382 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 17:34:57 +0800 Subject: [PATCH 1/2] 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 2/2] 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 @@ - +