Merge "Revert "haptics: update hapitcs sink and slot setting"" into udc-d1-dev am: 9305489bee

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

Change-Id: I8b1f00b2d844b0cd26dfd4ec3b541b9a2720ac99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-30 16:44:10 +00:00 committed by Automerger Merge Worker
commit fd341575b2
3 changed files with 4 additions and 4 deletions

View file

@ -42,7 +42,7 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- 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

@ -39,8 +39,8 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- Haptic setting -->
<ctl name="Haptics Streaming Source" value="ASP Rx"/>
<ctl name="HR Haptics Streaming Source" value="ASP Rx"/>
<ctl name="Haptics Source" value="PCM"/>
<ctl name="HR 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

@ -42,7 +42,7 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- 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"/>