diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk
index 8774603..e44915f 100644
--- a/audio/tegu/audio-tables.mk
+++ b/audio/tegu/audio-tables.mk
@@ -33,7 +33,7 @@ PRODUCT_COPY_FILES += \
     device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
 
 # Speaker firmware files
-SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw
+SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/tas2572
 SPK_FIRMWARE_FULL_PATH := device/google/tegu/audio/$(SPK_FIRMWARE_PATH)
 
 PRODUCT_COPY_FILES += $(call copy-files,$(wildcard  $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
diff --git a/audio/tegu/cs35l41/crus_sp_cal_mixer_paths.xml b/audio/tegu/cs35l41/crus_sp_cal_mixer_paths.xml
deleted file mode 100644
index bbf1685..0000000
--- a/audio/tegu/cs35l41/crus_sp_cal_mixer_paths.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.    -->
-<!--                                                                        -->
-<!-- Redistribution and use in source and binary forms, with or without     -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met:                                                                   -->
-<!--     * Redistributions of source code must retain the above copyright   -->
-<!--       notice, this list of conditions and the following disclaimer.    -->
-<!--     * Redistributions in binary form must reproduce the above          -->
-<!--       copyright notice, this list of conditions and the following      -->
-<!--       disclaimer in the documentation and/or other materials provided  -->
-<!--       with the distribution.                                           -->
-<!--     * Neither the name of The Linux Foundation nor the names of its    -->
-<!--       contributors may be used to endorse or promote products derived  -->
-<!--       from this software without specific prior written permission.    -->
-<!--                                                                        -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
-<mixer>
-    <!-- Initial Values -->
-    <!-- Preload Stage -->
-    <ctl name="Main AMP Enable Switch" value="0" />
-    <ctl name="DSP1 Preload Switch" value="0" />
-    <ctl name="R Main AMP Enable Switch" value="0" />
-    <ctl name="R DSP1 Preload Switch" value="0" />
-    <!-- Clock-trigger Stage -->
-    <ctl name="SINK_IDS" id="0" value="-1"/>
-    <ctl name="SINK_IDS" id="1" value="-1"/>
-    <ctl name="PCM Playback Volume" value="10"/>
-    <ctl name="TDM_0_RX Mixer EP6" value="0"/>
-
-    <!-- Preparation Stage -->
-    <path name="crus-switch-fw-prepare">
-        <ctl name="DRE DRE Switch" value="1" />
-        <ctl name="VBSTMON Output Switch" value="1" />
-        <ctl name="DSP Booted" value="0" />
-        <ctl name="DSP1 Preload Switch" value="0" />
-        <ctl name="R DRE DRE Switch" value="1" />
-        <ctl name="R VBSTMON Output Switch" value="1" />
-        <ctl name="R DSP Booted" value="0" />
-        <ctl name="R DSP1 Preload Switch" value="0" />
-    </path>
-
-    <!-- Preload Stage -->
-    <path name="crus-fw-preload">
-        <ctl name="DSP1 Preload Switch" value="1" />
-        <ctl name="R DSP1 Preload Switch" value="1" />
-    </path>
-
-    <path name="crus-fw-preload-amp1">
-        <ctl name="DSP1 Preload Switch" value="1" />
-    </path>
-
-    <path name="crus-fw-preload-amp2">
-        <ctl name="R DSP1 Preload Switch" value="1" />
-    </path>
-
-    <!-- Firmware-switching Stage -->
-    <path name="crus-switch-fw-Calibration">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="Digital PCM Volume" value="817" />
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Calibration" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R Digital PCM Volume" value="817" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Calibration" />
-    </path>
-
-    <path name="crus-switch-fw-Diagnostic">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="Digital PCM Volume" value="817" />
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Diagnostic" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R Digital PCM Volume" value="817" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Diagnostic" />
-    </path>
-
-    <path name="crus-switch-fw-Protection">
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Protection" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Protection" />
-    </path>
-
-    <!-- DSP-initialization Stage -->
-    <path name="crus-dsp-pre-calibration-amp1">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-calibration-amp2">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-calibration">
-        <path name="crus-dsp-pre-calibration-amp1" />
-        <path name="crus-dsp-pre-calibration-amp2" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic-amp1">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic-amp2">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic">
-        <path name="crus-dsp-pre-diagnostic-amp1" />
-        <path name="crus-dsp-pre-diagnostic-amp2" />
-    </path>
-
-    <path name="crus-dsp-pre-protection">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <!-- Clock-trigger Stage -->
-    <path name="platform-controls">
-        <ctl name="PCM Playback Volume" value="1000"/>
-        <ctl name="SINK_IDS" id="0" value="0"/>
-        <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP6" value="1"/>
-    </path>
-
-    <!-- Post loaded firmware -->
-    <path name="crus-dsp-post-loading-fw">
-        <ctl name="Main AMP Enable Switch" value="0" />
-        <ctl name="R Main AMP Enable Switch" value="0" />
-    </path>
-
-    <!-- Value & Information Fetch Stage -->
-    <path name="platform-values">
-        <ctl name="TDM_0_RX Format" />
-        <ctl name="TDM_0_RX Chan" />
-        <ctl name="TDM_0_RX Sample Rate" />
-        <ctl name="PCM Playback Volume" />
-        <ctl name="TDM_0_RX Mixer EP6" />
-    </path>
-
-    <path name="cs35l41-values">
-        <ctl name="DRE DRE Switch" />
-        <ctl name="R DRE DRE Switch" />
-        <ctl name="VBSTMON Output Switch" />
-        <ctl name="R VBSTMON Output Switch" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        <ctl name="R Digital PCM Volume" />
-        <ctl name="PCM Source" />
-        <ctl name="R PCM Source" />
-        <ctl name="DSP Booted" />
-        <ctl name="R DSP Booted" />
-        <ctl name="Main AMP Enable Switch" />
-        <ctl name="R Main AMP Enable Switch" />
-        <ctl name="DSP1 Preload Switch" />
-        <ctl name="R DSP1 Preload Switch" />
-        <ctl name="DSP1 Firmware" />
-        <ctl name="R DSP1 Firmware" />
-    </path>
-
-
-    <!-- Note that the order of controls does matter because
-         it should be matched to the structure defined in
-         sp_cal_common.h -->
-    <!--
-        struct calibration_data {
-            unsigned int cal_r;
-            unsigned int cal_status;
-            unsigned int cal_checksum;
-            unsigned int cal_ambient;
-            unsigned int amp_pcm_gain;
-            unsigned int digital_pcm_gain;
-        };
-    -->
-    <path name="cs35l41-dsp-amp1-calibration-values">
-        <ctl name="DSP1 Calibration cd CAL_R" />
-        <ctl name="DSP1 Calibration cd CAL_STATUS" />
-        <ctl name="DSP1 Calibration cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Calibration cd CAL_AMBIENT" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-
-        <!-- Only for debug print -->
-        <ctl name="DSP1 Calibration cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-calibration-values">
-        <ctl name="R DSP1 Calibration cd CAL_R" />
-        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
-        <ctl name="R DSP1 Calibration cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Calibration cd CAL_AMBIENT" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-
-        <!-- Only for debug print -->
-        <ctl name="R DSP1 Calibration cd CAL_SET_STATUS" />
-    </path>
-
-    <!--
-        struct diagnostic_data {
-            struct calibration_data calibration_data;
-            unsigned int z_low_diff;
-            unsigned int diag_f0;
-            unsigned int diag_f0_status;
-        };
-    -->
-    <path name="cs35l41-dsp-amp1-diagnostic-values">
-        <!-- struct calibration_data START -->
-        <ctl name="DSP1 Diagnostic cd CAL_R" />
-        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="DSP1 Diagnostic cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Diagnostic cd CAL_AMBIENT" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        <!-- struct calibration_data END -->
-        <ctl name="DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
-
-        <!-- Only for debug print -->
-        <ctl name="DSP1 Diagnostic cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-diagnostic-values">
-        <!-- struct calibration_data START -->
-        <ctl name="R DSP1 Diagnostic cd CAL_R" />
-        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="R DSP1 Diagnostic cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Diagnostic cd CAL_AMBIENT" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-        <!-- struct calibration_data END -->
-        <ctl name="R DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
-
-        <!-- Only for debug print -->
-        <ctl name="R DSP1 Diagnostic cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-protection-values">
-        <!-- struct calibration_data START -->
-        <ctl name="DSP1 Protection cd CAL_R" />
-        <ctl name="DSP1 Protection cd CAL_STATUS" />
-        <ctl name="DSP1 Protection cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Protection cd CAL_AMBIENT" />
-
-        <!-- These controls are unrelated so we can simply
-             skip them
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        -->
-        <!-- struct calibration_data END -->
-    </path>
-
-    <path name="cs35l41-dsp-amp2-protection-values">
-        <!-- struct calibration_data START -->
-        <ctl name="R DSP1 Protection cd CAL_R" />
-        <ctl name="R DSP1 Protection cd CAL_STATUS" />
-        <ctl name="R DSP1 Protection cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Protection cd CAL_AMBIENT" />
-
-        <!-- These controls are unrelated so we can simply
-             skip them
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-        -->
-        <!-- struct calibration_data END -->
-    </path>
-
-    <path name="cs35l41-dsp-amp1-calibration-completion">
-        <ctl name="DSP1 Calibration cd CAL_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-calibration-completion">
-        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-protection-completion">
-        <ctl name="DSP1 Protection cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-protection-completion">
-        <ctl name="R DSP1 Protection cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-diagnostic-completion">
-        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-diagnostic-completion">
-        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-enable-status">
-        <ctl name="Main AMP Enable Switch" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-enable-status">
-        <ctl name="R Main AMP Enable Switch" />
-    </path>
-</mixer>
diff --git a/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-cali.bin b/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-cali.bin
deleted file mode 100644
index fbc4294..0000000
Binary files a/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-cali.bin and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin b/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin
deleted file mode 100644
index dc870a8..0000000
Binary files a/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
deleted file mode 100644
index 3ef2752..0000000
Binary files a/audio/tegu/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-cali.bin b/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-cali.bin
deleted file mode 100644
index b6652b4..0000000
Binary files a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-cali.bin and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-cali.wmfw b/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-cali.wmfw
deleted file mode 100644
index 504fa98..0000000
Binary files a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-cali.wmfw and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-diag.bin b/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-diag.bin
deleted file mode 100644
index 8f7507e..0000000
Binary files a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-diag.bin and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-diag.wmfw b/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-diag.wmfw
deleted file mode 100644
index 86cd6bd..0000000
Binary files a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-diag.wmfw and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
deleted file mode 100644
index 4bdf630..0000000
Binary files a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-prot.bin and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-prot.wmfw b/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-prot.wmfw
deleted file mode 100644
index 504fa98..0000000
Binary files a/audio/tegu/cs35l41/fw/cs35l41-dsp1-spk-prot.wmfw and /dev/null differ
diff --git a/audio/tegu/cs35l41/fw/fast_switch1.txt b/audio/tegu/cs35l41/fw/fast_switch1.txt
deleted file mode 100644
index cb980a3..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch1.txt
+++ /dev/null
@@ -1 +0,0 @@
-11,4,768,1236,1075264,139265,2295815,1,7,0,-2054420945
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch2.txt b/audio/tegu/cs35l41/fw/fast_switch2.txt
deleted file mode 100644
index cb980a3..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch2.txt
+++ /dev/null
@@ -1 +0,0 @@
-11,4,768,1236,1075264,139265,2295815,1,7,0,-2054420945
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch3.txt b/audio/tegu/cs35l41/fw/fast_switch3.txt
deleted file mode 100644
index 43165fe..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch3.txt
+++ /dev/null
@@ -1 +0,0 @@
-14,4,768,1236,1075264,204800,2296071,1,21,4134355,1416112,8388607,2,689623277
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch4.txt b/audio/tegu/cs35l41/fw/fast_switch4.txt
deleted file mode 100644
index 43165fe..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch4.txt
+++ /dev/null
@@ -1 +0,0 @@
-14,4,768,1236,1075264,204800,2296071,1,21,4134355,1416112,8388607,2,689623277
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch5.txt b/audio/tegu/cs35l41/fw/fast_switch5.txt
deleted file mode 100644
index 1d1f114..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch5.txt
+++ /dev/null
@@ -1 +0,0 @@
-11,4,768,1236,1075264,139267,2295815,1,7,0,1329754275
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch6.txt b/audio/tegu/cs35l41/fw/fast_switch6.txt
deleted file mode 100644
index 1d1f114..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch6.txt
+++ /dev/null
@@ -1 +0,0 @@
-11,4,768,1236,1075264,139267,2295815,1,7,0,1329754275
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch7.txt b/audio/tegu/cs35l41/fw/fast_switch7.txt
deleted file mode 100644
index a9a13f5..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch7.txt
+++ /dev/null
@@ -1 +0,0 @@
-14,4,768,1236,1075264,204804,2296071,1,21,4409979,1416112,8388607,2,2060109510
\ No newline at end of file
diff --git a/audio/tegu/cs35l41/fw/fast_switch8.txt b/audio/tegu/cs35l41/fw/fast_switch8.txt
deleted file mode 100644
index a9a13f5..0000000
--- a/audio/tegu/cs35l41/fw/fast_switch8.txt
+++ /dev/null
@@ -1 +0,0 @@
-14,4,768,1236,1075264,204804,2296071,1,21,4409979,1416112,8388607,2,2060109510
\ No newline at end of file
diff --git a/audio/tegu/tas2572/tismartpa_driver_tuning.bin b/audio/tegu/tas2572/tismartpa_driver_tuning.bin
new file mode 100644
index 0000000..727b5bc
Binary files /dev/null and b/audio/tegu/tas2572/tismartpa_driver_tuning.bin differ