diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 33e36c7..f3fbd8b 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -177,13 +177,8 @@
     [SND_DEVICE_OUT_HEADPHONES] = 10,
     [SND_DEVICE_OUT_LINE] = 10,
     [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,
-#ifdef PLATFORM_MSM8084
-    [SND_DEVICE_OUT_VOICE_HANDSET] = 67,
-    [SND_DEVICE_OUT_VOICE_SPEAKER] = 66,
-#else
-    [SND_DEVICE_OUT_VOICE_HANDSET] = 7,
-    [SND_DEVICE_OUT_VOICE_SPEAKER] = 15,
-#endif
+    [SND_DEVICE_OUT_VOICE_HANDSET] = ACDB_ID_VOICE_HANDSET,
+    [SND_DEVICE_OUT_VOICE_SPEAKER] = ACDB_ID_VOICE_SPEAKER,
     [SND_DEVICE_OUT_VOICE_HAC_HANDSET] = 53,
     [SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,
     [SND_DEVICE_OUT_VOICE_LINE] = 10,
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index bbb90a7..bd7e3ee 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -101,11 +101,15 @@
 #define DEFAULT_VOLUME_RAMP_DURATION_MS 20
 
 #ifdef PLATFORM_MSM8084
+#define ACDB_ID_VOICE_SPEAKER 66
+#define ACDB_ID_VOICE_HANDSET 67
 #define ACDB_ID_VOICE_HANDSET_TMUS 67
 #define ACDB_ID_VOICE_DMIC_EF_TMUS 89
 #else
-#define ACDB_ID_VOICE_HANDSET_TMUS 7
-#define ACDB_ID_VOICE_DMIC_EF_TMUS 41
+#define ACDB_ID_VOICE_SPEAKER 15
+#define ACDB_ID_VOICE_HANDSET 7
+#define ACDB_ID_VOICE_HANDSET_TMUS 88
+#define ACDB_ID_VOICE_DMIC_EF_TMUS 89
 #endif
 
 #define MAX_VOL_INDEX 5