commit d53dd1bddf620292a97238ec98c07ef700e2b7df
author Sujin Panicker <spanic@codeaurora.org> Mon Dec 23 18:56:54 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Feb 10 01:26:58 2020 -0800
tree 0cc7bc17e8e5eaa03a86275851a9d6f497d104f0
parent 0dd5924d7522d46467a073ec4f4380331b23dee0

audio: 8916 & 8974 platform convergence

Platform convergence specific to msm8937,
and msm8953

Change-Id: Iad9e3b53b7b2f78d3bf8b0ff9d937f3d053b8f62
(cherry picked from commit e6e19e6e26562f14fb97fb0b8ddc05483ad59b21)

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 7bb699c..be138c0 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -394,7 +394,8 @@
 #define HIFI_BUFFER_OUTPUT_PERIOD_COUNT 2
 
 /* Used in calculating fragment size for pcm offload */
-#ifdef PLATFORM_MSMFALCON
+#if defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \
+    defined (PLATFORM_MSM8953)
 #define PCM_OFFLOAD_BUFFER_DURATION 40 /* 40 millisecs */
 #else
 #define PCM_OFFLOAD_BUFFER_DURATION 80 /* 80 millisecs */
@@ -478,7 +479,8 @@
     defined (PLATFORM_TRINKET) || defined (PLATFORM_LITO) || \
     defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL)
 #define PLAYBACK_OFFLOAD_DEVICE2 17
-#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937)
+#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \
+      defined (PLATFORM_MSM8953)
 #define PLAYBACK_OFFLOAD_DEVICE2 24
 #endif
 
@@ -490,7 +492,7 @@
     defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \
     defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \
     defined (PLATFORM_MSM8937) || defined (PLATFORM_ATOLL) || \
-    defined (PLATFORM_BENGAL)
+    defined (PLATFORM_BENGAL) || defined (PLATFORM_MSM8953)
 #define PLAYBACK_OFFLOAD_DEVICE3 18
 #define PLAYBACK_OFFLOAD_DEVICE4 34
 #define PLAYBACK_OFFLOAD_DEVICE5 35
@@ -520,7 +522,8 @@
 #ifdef PLATFORM_MSM8610
 #define LOWLATENCY_PCM_DEVICE 12
 #define EC_REF_RX "SEC_I2S_RX"
-#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937)
+#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \
+      defined (PLATFORM_MSM8953)
 #define LOWLATENCY_PCM_DEVICE 12
 #define EC_REF_RX "I2S_RX"
 #define MMAP_PLAYBACK_PCM_DEVICE 2
@@ -576,7 +579,8 @@
 #define VOLTE_CALL_PCM_DEVICE 15
 #define QCHAT_CALL_PCM_DEVICE 37
 #define VOWLAN_CALL_PCM_DEVICE 16
-#elif PLATFORM_MSMFALCON
+#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \
+      defined (PLATFORM_MSM8953)
 #define VOICE_CALL_PCM_DEVICE 2
 #define VOICE2_CALL_PCM_DEVICE 13
 #define VOLTE_CALL_PCM_DEVICE 15
@@ -623,7 +627,8 @@
 #define HFP_SCO_RX 29
 #define HFP_ASM_RX_TX 36
 #define HFP_EXT_EC_REF_TX 1
-#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937)
+#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \
+      defined (PLATFORM_MSM8953)
 #define HFP_SCO_RX 17
 #define HFP_ASM_RX_TX 18
 #else