commit d9bd930947bf027e9b9446d209afbad8d0d9e63b
author Zhou Song <zhous@codeaurora.org> Tue Aug 04 16:34:45 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 19 22:00:06 2020 -0700
tree e0b2bfbcf5949248832f93e95a1378ba405d0d7b
parent 2c9f825d14910adea432fbd7f7201e269f282093

hal: add "haptics" device definition

Add a particular device for haptics usecase, remove
previous combo device definitions.

Change-Id: I4f4b6b464f2a0244c7014157cbbbb7ff783abf8a

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index a475ed7..1bca0c6 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -72,14 +72,9 @@
     SND_DEVICE_OUT_HEADPHONES_DSD,
     SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER,
     SND_DEVICE_OUT_HEADPHONES_44_1,
-    SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS,
     SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
     SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER,
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES,
-    SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS,
     SND_DEVICE_OUT_SPEAKER_AND_LINE,
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE,
     SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1,
@@ -99,16 +94,12 @@
     SND_DEVICE_OUT_DISPLAY_PORT1,
     SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT,
     SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT1,
-    SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT1_AND_HAPTICS,
     SND_DEVICE_OUT_BT_SCO,
     SND_DEVICE_OUT_BT_SCO_WB,
     SND_DEVICE_OUT_BT_SCO_SWB,
     SND_DEVICE_OUT_BT_A2DP,
     SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP,
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP,
-    SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS,
     SND_DEVICE_OUT_VOICE_HANDSET_TMUS,
     SND_DEVICE_OUT_SPEAKER_AND_BT_SCO,
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO,
@@ -116,12 +107,6 @@
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB,
     SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB,
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB,
-    SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS,
     SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO,
     SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB,
     SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_SWB,
@@ -141,8 +126,6 @@
     SND_DEVICE_OUT_USB_HEADPHONES,
     SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET,
     SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET,
-    SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS,
-    SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS,
     SND_DEVICE_OUT_VOICE_USB_HEADPHONES,
     SND_DEVICE_OUT_VOICE_USB_HEADSET,
     SND_DEVICE_OUT_USB_HEADSET_SPEC,
@@ -183,6 +166,7 @@
     SND_DEVICE_OUT_BUS_PAX,
     SND_DEVICE_OUT_BUS_RSE,
     SND_DEVICE_OUT_CALL_PROXY,
+    SND_DEVICE_OUT_HAPTICS,
     SND_DEVICE_OUT_END,
 
     /*