From 12c436b395a9d5adcf159a1382a27a155171d39d Mon Sep 17 00:00:00 2001
From: Tai Kuo <taikuo@google.com>
Date: Tue, 16 May 2023 15:59:27 +0800
Subject: [PATCH] Revert "haptics: update hapitcs sink and slot setting"

This reverts commit be92d60ec5abae7f1ea40cd7ce22d1fc6cca804d.

Bug: 278018625
Test: Check audio coupled haptics at the sound preview app.
Change-Id: I35d52c31015c13670fc6d4e8ef57a3d0ea641391
---
 audio/husky/config/mixer_paths.xml      | 2 +-
 audio/ripcurrent/config/mixer_paths.xml | 4 ++--
 audio/shiba/config/mixer_paths.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/husky/config/mixer_paths.xml b/audio/husky/config/mixer_paths.xml
index 8e3c6b0..8845f54 100644
--- a/audio/husky/config/mixer_paths.xml
+++ b/audio/husky/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/ripcurrent/config/mixer_paths.xml b/audio/ripcurrent/config/mixer_paths.xml
index 339f625..6bbe394 100644
--- a/audio/ripcurrent/config/mixer_paths.xml
+++ b/audio/ripcurrent/config/mixer_paths.xml
@@ -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"/>
diff --git a/audio/shiba/config/mixer_paths.xml b/audio/shiba/config/mixer_paths.xml
index 8e3c6b0..8845f54 100644
--- a/audio/shiba/config/mixer_paths.xml
+++ b/audio/shiba/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"/>