msm: audio: qdsp6v2: Change config for RTAC
Change config for real-time audio calibration (RTAC)
since it is used by both 8660 and 8960.
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 58e2770..1e95ce9 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1222,12 +1222,11 @@
Enable support audio factory test mode devices. This is used
in a production line environment.
-config MSM8X60_RTAC
- tristate "MSM8X60 real-time audio calibration support"
- depends on MSM8X60_AUDIO
- default n
+config RTAC
+ bool "MSM8K real-time audio calibration support"
+ default y
help
- Enable support for rtac in qdsp6v2. This enables calibration during
+ Enable support for rtac. This enables calibration during
audio operation
config MSM7X27A_AUDIO
diff --git a/arch/arm/mach-msm/qdsp6v2/rtac.c b/arch/arm/mach-msm/qdsp6v2/rtac.c
index b33d354..4d0cc43 100644
--- a/arch/arm/mach-msm/qdsp6v2/rtac.c
+++ b/arch/arm/mach-msm/qdsp6v2/rtac.c
@@ -25,7 +25,7 @@
#include <sound/q6asm.h>
#include <sound/q6adm.h>
-#ifndef CONFIG_MSM8X60_RTAC
+#ifndef CONFIG_RTAC
void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id) {}
void rtac_remove_adm_device(u32 port_id, u32 popp_id) {}
diff --git a/include/sound/q6adm.h b/include/sound/q6adm.h
index 4b9eb90..ef6eb9e 100644
--- a/include/sound/q6adm.h
+++ b/include/sound/q6adm.h
@@ -42,7 +42,7 @@
int adm_matrix_map(int session_id, int path, int num_copps,
unsigned int *port_id, int copp_id);
-#ifdef CONFIG_MSM8X60_RTAC
+#ifdef CONFIG_RTAC
int adm_get_copp_id(int port_id);
#endif
diff --git a/include/sound/q6asm.h b/include/sound/q6asm.h
index e3507ee..13e2846 100644
--- a/include/sound/q6asm.h
+++ b/include/sound/q6asm.h
@@ -252,7 +252,7 @@
/* Client can set the IO mode to either AIO/SIO mode */
int q6asm_set_io_mode(struct audio_client *ac, uint32_t mode);
-#ifdef CONFIG_MSM8X60_RTAC
+#ifdef CONFIG_RTAC
/* Get Service ID for APR communication */
int q6asm_get_apr_service_id(int session_id);
#endif