Merge changes from topic "CirrusRAM19_drv7.0.0_dsp4.0.1_k5.10_f10" into udc-dev am: 50a71f056a

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23259325

Change-Id: I927fde8d6c6aaa15adb10836568231c9d7f5642b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-01 16:18:52 +00:00 committed by Automerger Merge Worker
commit 5989843e4a
2 changed files with 3 additions and 4 deletions

View file

@ -40,8 +40,8 @@
<ctl name="TDM_0_TX Format" value="S32_LE"/> <ctl name="TDM_0_TX Format" value="S32_LE"/>
<!-- Haptic setting --> <!-- Haptic setting -->
<ctl name="Haptics Streaming Source" value="ASP Rx"/> <ctl name="Haptics Source" value="PCM"/>
<ctl name="HR Haptics Streaming Source" value="ASP Rx"/> <ctl name="HR Haptics Source" value="PCM"/>
<ctl name="HAPTIC_RX Format" value="S32_LE"/> <ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/> <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/> <ctl name="HAPTIC_RX Chan" value="Four"/>

View file

@ -10,8 +10,7 @@ modprobe|bcmdhd4389.ko
modprobe|snd-soc-cs35l41-i2c.ko modprobe|snd-soc-cs35l41-i2c.ko
modprobe|fst2.ko modprobe|fst2.ko
modprobe|ftm5.ko modprobe|ftm5.ko
modprobe|cl_dsp.ko modprobe|cs40l26-i2c.ko
modprobe|input-cs40l26-i2c.ko
modprobe|snd-soc-cs40l26.ko modprobe|snd-soc-cs40l26.ko
# All device specific modules loaded # All device specific modules loaded