From 97a50e32436dd27e48c5e95195b62d0f82e7abb7 Mon Sep 17 00:00:00 2001
From: Andrula Song <andrula.song@intel.com>
Date: Tue, 30 Jan 2024 15:53:20 +0800
Subject: [PATCH] Audio: Fix the kconfig error of mixin_mixout.

Fixes the commit f4d043724d77 ("Audio: Move components related config
to subfolder").

Due to a copy/paste error, the content of mixin_mixout/Kconfig has
been a copy of aria/Kconfig. This patch fixes the copy/paste error,
and adds IPC version dependence for COMP_MIXER and COMP_MIXIN_MIXOUT.

Signed-off-by: Andrula Song <andrula.song@intel.com>
---
 src/audio/Kconfig              |  2 ++
 src/audio/mixer/Kconfig        |  1 +
 src/audio/mixin_mixout/Kconfig | 16 ++++++----------
 zephyr/CMakeLists.txt          | 24 +++++++++++-------------
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/audio/Kconfig b/src/audio/Kconfig
index aee78f5df32a..7bd05c46f239 100644
--- a/src/audio/Kconfig
+++ b/src/audio/Kconfig
@@ -96,6 +96,8 @@ config COMP_TONE
 
 rsource "mixer/Kconfig"
 
+rsource "mixin_mixout/Kconfig"
+
 rsource "mux/Kconfig"
 
 config COMP_KPB
diff --git a/src/audio/mixer/Kconfig b/src/audio/mixer/Kconfig
index 272e9718de52..74560108d600 100644
--- a/src/audio/mixer/Kconfig
+++ b/src/audio/mixer/Kconfig
@@ -2,6 +2,7 @@
 
 config COMP_MIXER
 	bool "Mixer component"
+	depends on IPC_MAJOR_3
 	default y
 	help
 	  Select for Mixer component
diff --git a/src/audio/mixin_mixout/Kconfig b/src/audio/mixin_mixout/Kconfig
index ba1b1bfda9fe..449d6617fce7 100644
--- a/src/audio/mixin_mixout/Kconfig
+++ b/src/audio/mixin_mixout/Kconfig
@@ -1,12 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-config COMP_ARIA
-        bool "ARIA component"
-        default n
-        depends on IPC_MAJOR_4
-        help
-          Select for Automatic Regressive Input Amplifier Module component
-	  ARIA applies variable gain into incoming signal.
-	  Applied gain is in range <1, 2 power attenuation>
-	  Currently ARIA introduces gain transition and algorithmic
-	  latency equal to 1 ms.
+config COMP_MIXIN_MIXOUT
+	bool "Mixin_mixout component"
+	depends on IPC_MAJOR_4
+	default y
+	help
+	  Select for Mixin_mixout component
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 4d1fe49f6662..c2cf0bcfffb1 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -551,19 +551,17 @@ zephyr_library_sources_ifdef(CONFIG_COMP_KPB
 	${SOF_AUDIO_PATH}/kpb.c
 )
 
-if(CONFIG_IPC_MAJOR_3)
-	zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
-		${SOF_AUDIO_PATH}/mixer/mixer.c
-		${SOF_AUDIO_PATH}/mixer/mixer_generic.c
-		${SOF_AUDIO_PATH}/mixer/mixer_hifi3.c
-	)
-elseif(CONFIG_IPC_MAJOR_4)
-	zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout.c
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_generic.c
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_hifi3.c
-	)
-endif()
+zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
+	${SOF_AUDIO_PATH}/mixer/mixer.c
+	${SOF_AUDIO_PATH}/mixer/mixer_generic.c
+	${SOF_AUDIO_PATH}/mixer/mixer_hifi3.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_COMP_MIXIN_MIXOUT
+	${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout.c
+	${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_generic.c
+	${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_hifi3.c
+)
 
 zephyr_library_sources_ifdef(CONFIG_COMP_TONE
 	${SOF_AUDIO_PATH}/tone.c