From d1dbc413121d0746c75478b27a2f11230b58b405 Mon Sep 17 00:00:00 2001 From: Paul Olaru Date: Mon, 16 May 2022 15:52:25 +0300 Subject: [PATCH] topology1: remove setup config info from further codec_adapter topologies Remove the setup config info from all initial config data in the codec_adapter kcontrol's. This is no longer needed. Fixes: bfd5e61768713 ("topology1: remove setup config info from all codec_adapter topologies") Fixes: 692299f2a65fc ("codec_adapter: Remove setup config from module data") Signed-off-by: Paul Olaru --- tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 | 8 +++----- tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 index 84b8a419b..b19f1ede9 100644 --- a/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4 @@ -27,13 +27,11 @@ define(`CA_UUID', cadence_codec_uuid) # Post process setup config define(`CA_SETUP_CONTROLBYTES', `` bytes "0x53,0x4f,0x46,0x00,0x00,0x00,0x00,0x00,' -` 0x20,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' +` 0x0C,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' -` 0x06,0x01,0xDE,0xCA,0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' -` 0x0C,0x00,0x00,0x00,0x20,0x00,0x00,0x00"'' +` 0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,' +` 0x20,0x00,0x00,0x00"'' ) define(`CA_SETUP_CONTROLBYTES_MAX', 300) diff --git a/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 index 799019ea3..97622bf04 100644 --- a/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 +++ b/tools/topology/topology1/sof-imx8mp-compr-wm8960-mixer.m4 @@ -25,13 +25,11 @@ define(`CA_UUID', cadence_codec_uuid) # Post process setup config define(`CA_SETUP_CONTROLBYTES', `` bytes "0x53,0x4f,0x46,0x00,0x00,0x00,0x00,0x00,' -` 0x20,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' +` 0x0C,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' -` 0x06,0x01,0xDE,0xCA,0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' -` 0x0C,0x00,0x00,0x00,0x20,0x00,0x00,0x00"'' +` 0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,' +` 0x20,0x00,0x00,0x00"'' ) define(`CA_SETUP_CONTROLBYTES_MAX', 300)