foo.diff

diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index 5800466..5c5cc59 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -36,10 +36,15 @@
 		<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="14"/>
 		<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="14"/>
 		<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="18"/>
+		<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="12"/>
+		<device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="11"/>
 		<device name="SND_DEVICE_OUT_VOLTE_NB_HANDSET_TMUS" acdb_id="200"/>
 		<device name="SND_DEVICE_OUT_VOLTE_NB_ANC_HANDSET" acdb_id="200"/>
 
 	<!-- Input devices -->
 		<device name="SND_DEVICE_IN_HEADSET_MIC_AEC" acdb_id="47"/>
+		<device name="SND_DEVICE_IN_VOICE_DMIC" acdb_id="62"/>
+		<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="64"/>
+
 	</acdb_ids>
 </audio_platform_info>
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index 4560b46..39c7fcf 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -788,11 +788,20 @@
 	</path>
 
 	<path name="voice-speaker">
-		<path name="speaker" />
+		<ctl name="SLIM_0_RX Channels" value="One" />
+		<ctl name="SLIM_0_TX Channels" value="One" />
+		<!-- select (l + r)/2 -->
+		<ctl name="NXP Right Ch Select" value="3" />
+		<!-- Enable earpiece mode this toggles gpio -->
+		<ctl name="TFA9890 earpiece mode" value="Off" />
+		<ctl name="AIF1TX2 Input 1" value="SLIMRX1" />
+		<ctl name="SLIMTX5 Input 1" value="AIF1RX2" />
+		<ctl name="VOC_EXT_EC MUX" value="SLIMBUS_1_TX" />
+		<ctl name="Left SPK Mux" value="Off" />
 	</path>
 
 	<path name="voice-speaker-mic">
-		<path name="mic4" />
+		<path name="speaker-mic" />
 	</path>
 
 	<path name="voice-headphones">
diff --git a/system.prop b/system.prop
index d1c6c96..3bf389a 100644
--- a/system.prop
+++ b/system.prop
@@ -20,7 +20,7 @@ persist.audio.calfile4=/etc/acdbdata/Hdmi_cal.acdb
 persist.audio.calfile5=/etc/acdbdata/Headset_cal.acdb
 persist.audio.calfile6=/etc/acdbdata/Speaker_cal.acdb
 persist.audio.dualmic.config=endfire
-persist.audio.fluence.speaker=true
+persist.audio.fluence.speaker=false
 persist.audio.fluence.voicecall=true
 persist.audio.fluence.voicecomm=true
 persist.audio.fluence.voicerec=false