From ad2f035c068ef29876a6b6a423ab3909827da897 Mon Sep 17 00:00:00 2001 From: Pin-chih Lin Date: Tue, 15 Aug 2023 11:00:00 +0800 Subject: [PATCH] smart amp : Do not use DYNAMIC topology with DTS Follows after: 214f98378 ("smart amp : Do not use DYNAMIC topology") which makes DYNAMIC undefined during smart amp tplg pipeline pcm/dai config due to the use of volatile Kcontrols. This commit applies the same on sof-eq-iir-dts-codec-smart-amplifier.m4 which is used for (DTS + smart amp) projects. Signed-off-by: Pin-chih Lin --- .../topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 b/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 index e8e1f068c..e76cb4292 100644 --- a/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 +++ b/tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4 @@ -19,6 +19,10 @@ DEBUG_START # define the default macros. # define them in your specific platform .m4 if needed. +#undefine the DYNAMIC flag (if enabled, save it) for smart amplifier as it uses volatile kcontrols +ifdef(`DYNAMIC', `define(`SAVED_DYNAMIC', DYNAMIC)',`') +undefine(`DYNAMIC') + ifelse(SDW, `1', ` @@ -228,4 +232,7 @@ DAI_CONFIG(SSP, SMART_SSP_INDEX, SMART_BE_ID, SMART_SSP_NAME, SSP_CONFIG_DATA(SSP, SMART_SSP_INDEX, 32, 0, SMART_SSP_QUIRK))) ') +#Re-enable DYNAMIC flag if it was enabled for other pipelines +ifdef(`SAVED_DYNAMIC', `define(`DYNAMIC', 1)',`') + DEBUG_END