From fd7fd450b668fa8e38a25ce06d13dd2c1123055c Mon Sep 17 00:00:00 2001 From: Asha Talambedu Date: Wed, 24 Jul 2019 01:46:43 +0530 Subject: [PATCH] ASoC: tegra-alt: Modified ADSP config and prompts a) Both ADSP audio driver and OS are compiled with the same config setting. Therefore, defined a config to enable disablement of ADSP audio driver. b) In addition, removed prompts for symbols related to tegra-alt module drivers as the drivers as dependencies are not properly defined which can lead to illegal confgurations that might result in runtime failures Bug 200536088 Change-Id: I2a7e31d604cca6f86f9db47dc0a7f91e96c6605a Signed-off-by: Asha Talambedu Reviewed-on: https://git-master.nvidia.com/r/2159728 (cherry picked from commit 626e9724092aec5f0a39368cb51278a873cd7dfe) Reviewed-on: https://git-master.nvidia.com/r/2176657 GVS: Gerrit_Virtual_Submit Reviewed-by: Mohan Kumar D Reviewed-by: Sharad Gupta Reviewed-by: mobile promotions Tested-by: mobile promotions --- sound/soc/tegra-alt/Kconfig | 76 ++++++++++++------------------------- 1 file changed, 25 insertions(+), 51 deletions(-) diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig index dd460ad5..d3792609 100644 --- a/sound/soc/tegra-alt/Kconfig +++ b/sound/soc/tegra-alt/Kconfig @@ -6,22 +6,16 @@ config SND_SOC_TEGRA_ALT_186 depends on ARCH_TEGRA_18x_SOC config SND_SOC_TEGRA186_DSPK_ALT - tristate "Tegra186 DSPK driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 - help - Say Y or M if you want to add support for Tegra186 DSPK module. config SND_SOC_TEGRA186_ASRC_ALT - tristate "Tegra186 ASRC driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 - help - Say Y or M if you want to add support for Tegra186 ASRC module. config SND_SOC_TEGRA186_ARAD_ALT - tristate "Tegra186 ARAD driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186 - help - Say Y or M if you want to add support for Tegra186 ARAD module. config SND_SOC_TEGRA_ALT_FORCE_CARD_REG tristate "Enable sound card even if audio codec is missing on board" @@ -74,69 +68,49 @@ config SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT config SND_SOC_TEGRA210_XBAR_ALT - tristate "Tegra210 XBAR driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 XBAR module. config SND_SOC_TEGRA210_ADMAIF_ALT - tristate "Tegra210 ADMIF driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 APBIF module. config SND_SOC_TEGRA210_I2S_ALT - tristate "Tegra210 I2S driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 I2S module. config SND_SOC_TEGRA210_DMIC_ALT - tristate "Tegra210 DMIC driver" + tristate def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 DMIC module. config SND_SOC_TEGRA210_AMX_ALT - tristate "Tegra210 AMX driver" + tristate def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 AMX module. config SND_SOC_TEGRA210_ADX_ALT - tristate "Tegra210 ADX driver" + tristate def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 ADX module. config SND_SOC_TEGRA210_MIXER_ALT - tristate "Tegra210 MIXER driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 MIXER module. config SND_SOC_TEGRA210_SFC_ALT - tristate "Tegra210 SFC driver" + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 SFC module. config SND_SOC_TEGRA210_AFC_ALT - tristate "Tegra210 AFC driver" + tristate def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 AFC module. config SND_SOC_TEGRA210_MVC_ALT - tristate "Tegra210 MVC driver" + tristate def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 MVC module. config SND_SOC_TEGRA210_IQC_ALT tristate "Tegra210 IQC driver" @@ -145,25 +119,25 @@ config SND_SOC_TEGRA210_IQC_ALT Say Y or M if you want to add support for Tegra210 IQC module. config SND_SOC_TEGRA210_OPE_ALT - tristate "Tegra210 OPE driver" + tristate def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 - help - Say Y or M if you want to add support for Tegra210 OPE module. config SND_SOC_TEGRA210_ADSP_ALT - tristate "Tegra210 ADSP driver" - def_tristate SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP + tristate depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP select SND_SOC_COMPRESS + +config DISABLE_ADSP_AUDIO + bool "Disable ADSP Audio Driver" + def_bool n + depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP help - Say Y or M if you want to add support for Tegra210 ADSP module. + Say Y if you want to disable support for Tegra210 ADSP module config SND_SOC_TEGRA_ASOC_MACHINE_ALT - tristate "Tegra ASoC machine driver" + tristate depends on SND_SOC_TEGRA_ALT - help - Say Y or M if you want to add support for Tegra ASoC machine driver config SND_SOC_TEGRA_T210REF_MOBILE_ALT tristate "SoC Audio support for T210Ref mobile" @@ -201,7 +175,7 @@ config SND_SOC_TEGRA_T210REF_ALT select SND_SOC_TEGRA210_AFC_ALT select SND_SOC_TEGRA210_MVC_ALT select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP && !DISABLE_ADSP_AUDIO select SND_SOC_TEGRA_ASOC_HWDEP_ALT select SND_SOC_SPDIF select SND_SOC_AD193X_I2C @@ -226,7 +200,7 @@ config SND_SOC_TEGRA_T186REF_ALT select SND_SOC_TEGRA210_AFC_ALT select SND_SOC_TEGRA210_MVC_ALT select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP && !DISABLE_ADSP_AUDIO select SND_SOC_TEGRA186_ASRC_ALT select SND_SOC_TEGRA186_ARAD_ALT select SND_SOC_TEGRA186_DSPK_ALT @@ -261,7 +235,7 @@ config SND_SOC_TEGRA_T210REF_P2382_ALT select SND_SOC_TEGRA210_AFC_ALT select SND_SOC_TEGRA210_MVC_ALT select SND_SOC_TEGRA210_OPE_ALT - select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP && !DISABLE_ADSP_AUDIO select SND_SOC_TEGRA_ASOC_HWDEP_ALT select SND_SOC_SPDIF select SND_SOC_TEGRA_ASOC_MACHINE_ALT