Merge changes from topic "CirrusRAM19_drv7.0.0_dsp4.0.1_k5.10_b3" into udc-dev

* changes:
  Revert "haptics: update hapitcs sink and slot setting"
  Update cs40l26 modprobe modules
This commit is contained in:
Treehugger Robot 2023-06-01 07:36:42 +00:00 committed by Android (Google) Code Review
commit 5954dded61
2 changed files with 2 additions and 3 deletions

View file

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

View file

@ -8,8 +8,7 @@
# Modules here will be loaded *after* all common modules
modprobe|bcmdhd4389.ko
modprobe|snd-soc-cs35l41-i2c.ko
modprobe|cl_dsp.ko
modprobe|input-cs40l26-i2c.ko
modprobe|cs40l26-i2c.ko
modprobe|ftm5.ko
modprobe|sec_touch.ko
modprobe|snd-soc-cs40l26.ko