From 17eaf1af2a0c360e47d2b14a1ce1c6afaf4e7c9f Mon Sep 17 00:00:00 2001
From: Tai Kuo <taikuo@google.com>
Date: Tue, 16 May 2023 16:14:46 +0800
Subject: [PATCH] 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 @@
     <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"/>
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 @@
     <ctl name="TDM_0_TX Format" value="S32_LE"/>
 
     <!-- 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"/>
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 @@
     <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"/>