From bfd5e61768713bf25fe85030268a2f860eb26cf4 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Fri, 14 Jan 2022 13:18:48 -0800 Subject: [PATCH] topology1: remove setup config info from all codec_adapter topologies Remove the setup config info from all initial config data in the codec_adapter kcontrol's. This is no longer needed. Signed-off-by: Ranjani Sridharan --- .../development/sof-imx8-compr-aac-wm8960.m4 | 12 ++++-------- .../development/sof-imx8-compr-mp3-wm8960.m4 | 8 +++----- .../development/sof-imx8mp-compr-aac-wm8960.m4 | 11 ++++------- .../development/sof-imx8mp-compr-mp3-wm8960.m4 | 8 +++----- .../topology1/sof/pipe-waves-codec-playback.m4 | 8 +------- 5 files changed, 15 insertions(+), 32 deletions(-) diff --git a/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 index 048011192..4e5db8897 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-aac-wm8960.m4 @@ -38,16 +38,12 @@ define(`CA_UUID', cadence_codec_uuid) # Post process setup config define(`CA_SETUP_CONTROLBYTES', `` bytes "0x53,0x4f,0x46,0x00,0x00,0x00,0x00,0x00,' -` 0x2C,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' +` 0x18,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' -` 0x02,0x01,0xDE,0xCA,0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,0x07,0x00,0x00,0x00,' -` 0x0C,0x00,0x00,0x00,0x18,0x00,0x00,0x00,' -` 0x03,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00"'' -) +` 0x07,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,' +` 0x18,0x00,0x00,0x00,0x03,0x00,0x00,0x00,' +` 0x0C,0x00,0x00,0x00,0x02,0x00,0x00,0x00"'') define(`CA_SETUP_CONTROLBYTES_MAX', 300) diff --git a/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 index 5e7131c4b..1c7059d24 100644 --- a/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8-compr-mp3-wm8960.m4 @@ -38,13 +38,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/development/sof-imx8mp-compr-aac-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 index fb0ebd173..4a477462f 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-aac-wm8960.m4 @@ -38,15 +38,12 @@ define(`CA_UUID', cadence_codec_uuid) # Post process setup config define(`CA_SETUP_CONTROLBYTES', `` bytes "0x53,0x4f,0x46,0x00,0x00,0x00,0x00,0x00,' -` 0x2C,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' +` 0x18,0x00,0x00,0x00,0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' -` 0x02,0x01,0xDE,0xCA,0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,0x07,0x00,0x00,0x00,' -` 0x0C,0x00,0x00,0x00,0x18,0x00,0x00,0x00,' -` 0x03,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00"'' +` 0x07,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,' +` 0x18,0x00,0x00,0x00,0x03,0x00,0x00,0x00,' +` 0x0C,0x00,0x00,0x00,0x02,0x00,0x00,0x00"'' ) define(`CA_SETUP_CONTROLBYTES_MAX', 300) diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 index 9db15b8b8..576f757eb 100644 --- a/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 +++ b/tools/topology/topology1/development/sof-imx8mp-compr-mp3-wm8960.m4 @@ -38,13 +38,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/pipe-waves-codec-playback.m4 b/tools/topology/topology1/sof/pipe-waves-codec-playback.m4 index e311bad58..673e9d213 100644 --- a/tools/topology/topology1/sof/pipe-waves-codec-playback.m4 +++ b/tools/topology/topology1/sof/pipe-waves-codec-playback.m4 @@ -10,19 +10,13 @@ ifdef(`ENDPOINT_NAME',`',`fatal_error(`Pipe requires ENDPOINT_NAME to be defined define(`CA_SETUP_CONTROLBYTES', `` bytes "0x53,0x4f,0x46,0x00,' ` 0x00,0x00,0x00,0x00,' -` 0x20,0x00,0x00,0x00,' +` 0x0C,0x00,0x00,0x00,' ` 0x00,0x10,0x00,0x03,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00,' -` 0x00,0x01,0x41,0x57,' -` 0x00,0x00,0x00,0x00,' -` 0x80,0xBB,0x00,0x00,' -` 0x20,0x00,0x00,0x00,' -` 0x02,0x00,0x00,0x00,' - ` 0x00,0x00,0x00,0x00,' ` 0x0c,0x00,0x00,0x00,' ` 0x00,0x00,0x00,0x00"''