Merge "audio: bonito: change the filename" into pi-dev

29 files changed, 50 insertions, 50 deletions

diff --git a/acdbdata/OEM/sdm670-b4-snd-card/Bluetooth_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb
index 360329c2..360329c2 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/Bluetooth_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/General_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb
index 6ba67328..6ba67328 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/General_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/Global_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb
index 6d6b1bf2..6d6b1bf2 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/Global_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/Handset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb
index a5e00bb5..a5e00bb5 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/Handset_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/Hdmi_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb
index ef03f296..ef03f296 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/Hdmi_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/Headset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb
index c09ebb0b..c09ebb0b 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/Headset_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/Speaker_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb
index a4fcb4e5..a4fcb4e5 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/Speaker_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb
diff --git a/acdbdata/OEM/sdm670-b4-snd-card/workspaceFile.qwsp b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/workspaceFile.qwsp
index b30f969f..b30f969f 100644
--- a/acdbdata/OEM/sdm670-b4-snd-card/workspaceFile.qwsp
+++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/workspaceFile.qwsp
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/Bluetooth_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb
index 360329c2..360329c2 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/Bluetooth_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/General_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb
index 6ba67328..6ba67328 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/General_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/Global_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb
index 6d6b1bf2..6d6b1bf2 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/Global_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/Handset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb
index a5e00bb5..a5e00bb5 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/Handset_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/Hdmi_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb
index ef03f296..ef03f296 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/Hdmi_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/Headset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb
index c09ebb0b..c09ebb0b 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/Headset_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/Speaker_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb
index 2fd40b1f..2fd40b1f 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/Speaker_cal.acdb
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb
diff --git a/acdbdata/OEM/sdm670-s4-snd-card/workspaceFile.qwsp b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/workspaceFile.qwsp
index b30f969f..b30f969f 100644
--- a/acdbdata/OEM/sdm670-s4-snd-card/workspaceFile.qwsp
+++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/workspaceFile.qwsp
diff --git a/audio/crus_sp_config_b1_rx.bin b/audio/crus_sp_config_b4_rx.bin
index e21bb69d..e21bb69d 100644
--- a/audio/crus_sp_config_b1_rx.bin
+++ b/audio/crus_sp_config_b4_rx.bin
diff --git a/audio/crus_sp_config_b1_tx.bin b/audio/crus_sp_config_b4_tx.bin
index 068068d2..068068d2 100644
--- a/audio/crus_sp_config_b1_tx.bin
+++ b/audio/crus_sp_config_b4_tx.bin
diff --git a/audio/crus_sp_config_c1_rx.bin b/audio/crus_sp_config_s4_rx.bin
index 266ea48a..266ea48a 100644
--- a/audio/crus_sp_config_c1_rx.bin
+++ b/audio/crus_sp_config_s4_rx.bin
diff --git a/audio/crus_sp_config_c1_tx.bin b/audio/crus_sp_config_s4_tx.bin
index c81d6104..c81d6104 100644
--- a/audio/crus_sp_config_c1_tx.bin
+++ b/audio/crus_sp_config_s4_tx.bin
diff --git a/audio_platform_info_b4.xml b/audio_platform_info_intcodec_b4.xml
index 2f97000d..bcee5cb9 100644
--- a/audio_platform_info_b4.xml
+++ b/audio_platform_info_intcodec_b4.xml
@@ -28,7 +28,7 @@
     <acdb_ids>
         <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="15"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="513"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="512"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="45"/>
@@ -75,7 +75,7 @@
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
-        <param key="snd_card_name" value="sdm670-b4-snd-card"/>
+        <param key="snd_card_name" value="sdm670-intcodec-b4-snd-card"/>
     </config_params>
 
     <gain_db_to_level_mapping>
diff --git a/audio_platform_info_s4.xml b/audio_platform_info_intcodec_b4dev.xml
index 059e22bf..9f2f7a88 100644
--- a/audio_platform_info_s4.xml
+++ b/audio_platform_info_intcodec_b4dev.xml
@@ -75,7 +75,7 @@
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
-        <param key="snd_card_name" value="sdm670-s4-snd-card"/>
+        <param key="snd_card_name" value="sdm670-intcodec-b4dev-snd-card"/>
     </config_params>
 
     <gain_db_to_level_mapping>
diff --git a/audio_platform_info_b4dev.xml b/audio_platform_info_intcodec_s4.xml
index fa51f323..69183286 100644
--- a/audio_platform_info_b4dev.xml
+++ b/audio_platform_info_intcodec_s4.xml
@@ -28,7 +28,7 @@
     <acdb_ids>
         <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
         <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
-        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="15"/>
+        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="513"/>
         <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
         <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" acdb_id="512"/>
         <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="45"/>
@@ -75,7 +75,7 @@
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
-        <param key="snd_card_name" value="sdm670-b4dev-snd-card"/>
+        <param key="snd_card_name" value="sdm670-intcodec-s4-snd-card"/>
     </config_params>
 
     <gain_db_to_level_mapping>
diff --git a/audio_platform_info_s4dev.xml b/audio_platform_info_intcodec_s4dev.xml
index 18f5a797..f20e98bb 100644
--- a/audio_platform_info_s4dev.xml
+++ b/audio_platform_info_intcodec_s4dev.xml
@@ -75,7 +75,7 @@
     </pcm_ids>
     <config_params>
         <param key="input_mic_max_count" value="3"/>
-        <param key="snd_card_name" value="sdm670-s4dev-snd-card"/>
+        <param key="snd_card_name" value="sdm670-intcodec-s4dev-snd-card"/>
     </config_params>
 
     <gain_db_to_level_mapping>
diff --git a/device-bonito.mk b/device-bonito.mk
index f67b5ca5..149594d5 100644
--- a/device-bonito.mk
+++ b/device-bonito.mk
@@ -26,10 +26,10 @@ DEVICE_PACKAGE_OVERLAYS += device/google/bonito/bonito/overlay
 
 # Audio XMLs
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/mixer_paths_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_b4.xml \
-    $(LOCAL_PATH)/mixer_paths_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_b4dev.xml \
-    $(LOCAL_PATH)/audio_platform_info_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_b4.xml \
-    $(LOCAL_PATH)/audio_platform_info_b4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_b4dev.xml
+    $(LOCAL_PATH)/mixer_paths_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_b4.xml \
+    $(LOCAL_PATH)/mixer_paths_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_b4dev.xml \
+    $(LOCAL_PATH)/audio_platform_info_intcodec_b4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_b4.xml \
+    $(LOCAL_PATH)/audio_platform_info_intcodec_b4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_b4dev.xml
 
 PRODUCT_COPY_FILES += \
     device/google/bonito/nfc/libnfc-nxp.bonito.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
diff --git a/device-sargo.mk b/device-sargo.mk
index 499b7fb8..482b814a 100644
--- a/device-sargo.mk
+++ b/device-sargo.mk
@@ -26,10 +26,10 @@ DEVICE_PACKAGE_OVERLAYS += device/google/bonito/sargo/overlay
 
 # Audio XMLs
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/mixer_paths_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_s4.xml \
-    $(LOCAL_PATH)/mixer_paths_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_s4dev.xml \
-    $(LOCAL_PATH)/audio_platform_info_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_s4.xml \
-    $(LOCAL_PATH)/audio_platform_info_s4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_s4dev.xml
+    $(LOCAL_PATH)/mixer_paths_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_s4.xml \
+    $(LOCAL_PATH)/mixer_paths_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_intcodec_s4dev.xml \
+    $(LOCAL_PATH)/audio_platform_info_intcodec_s4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_s4.xml \
+    $(LOCAL_PATH)/audio_platform_info_intcodec_s4dev.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec_s4dev.xml
 
 PRODUCT_COPY_FILES += \
     device/google/bonito/nfc/libnfc-nxp.sargo.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
diff --git a/device.mk b/device.mk
index aafa6cc2..625cc911 100644
--- a/device.mk
+++ b/device.mk
@@ -673,51 +673,51 @@ PRODUCT_VENDOR_KERNEL_HEADERS := device/google/bonito/sdm710/kernel-headers
 
 # Audio ACDB data
 PRODUCT_COPY_FILES += \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/Bluetooth_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/General_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/Global_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/Handset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/Hdmi_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/Headset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/Speaker_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/Bluetooth_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/General_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/Global_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/Handset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/Hdmi_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/Headset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/Speaker_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/Bluetooth_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/General_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/Global_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/Handset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/Hdmi_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/Headset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/Speaker_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/Bluetooth_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/General_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/Global_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/Handset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/Hdmi_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/Headset_cal.acdb \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/Speaker_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/Bluetooth_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/General_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/Global_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/Handset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/Hdmi_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/Headset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/Speaker_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/Bluetooth_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/General_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/Global_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/Handset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/Hdmi_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/Headset_cal.acdb \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/Speaker_cal.acdb \
      device/google/bonito/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb
 
 # Audio ACDB workspace files for QACT
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4-snd-card/workspaceFile.qwsp \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4-snd-card/workspaceFile.qwsp \
-     device/google/bonito/acdbdata/OEM/sdm670-b4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-b4dev-snd-card/workspaceFile.qwsp \
-     device/google/bonito/acdbdata/OEM/sdm670-s4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-s4dev-snd-card/workspaceFile.qwsp
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4-snd-card/workspaceFile.qwsp \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4-snd-card/workspaceFile.qwsp \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-b4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-b4dev-snd-card/workspaceFile.qwsp \
+     device/google/bonito/acdbdata/OEM/sdm670-intcodec-s4-snd-card/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/OEM/sdm670-intcodec-s4dev-snd-card/workspaceFile.qwsp
 endif
 
 # CS35L36 Speaker Tuning
 PRODUCT_COPY_FILES += \
-    device/google/bonito/audio/crus_sp_config_b1_rx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_b1_rx.bin \
-    device/google/bonito/audio/crus_sp_config_b1_tx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_b1_tx.bin \
-    device/google/bonito/audio/crus_sp_config_c1_rx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_c1_rx.bin \
-    device/google/bonito/audio/crus_sp_config_c1_tx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_c1_tx.bin
+    device/google/bonito/audio/crus_sp_config_b4_rx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_b4_rx.bin \
+    device/google/bonito/audio/crus_sp_config_b4_tx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_b4_tx.bin \
+    device/google/bonito/audio/crus_sp_config_s4_rx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_s4_rx.bin \
+    device/google/bonito/audio/crus_sp_config_s4_tx.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/crus_sp_config_s4_tx.bin
 
 # Keymaster configuration
 PRODUCT_COPY_FILES += \
diff --git a/mixer_paths_b4.xml b/mixer_paths_intcodec_b4.xml
index 0817427c..0817427c 100644
--- a/mixer_paths_b4.xml
+++ b/mixer_paths_intcodec_b4.xml
diff --git a/mixer_paths_s4.xml b/mixer_paths_intcodec_s4.xml
index 0817427c..0817427c 100644
--- a/mixer_paths_s4.xml
+++ b/mixer_paths_intcodec_s4.xml