aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJanusz Krzysztofik <jmkrzyszt@gmail.com>2023-10-08 15:53:10 +0200
committerMark Brown <broonie@kernel.org>2023-10-23 19:40:21 +0100
commit7790bccd7bac3af28bf044e188215041eb142d56 (patch)
tree7f18351214b5dc2ed98e70d8f18272842558c347
parentASoC: Merge up v6.6-rc7 (diff)
downloadwireguard-linux-7790bccd7bac3af28bf044e188215041eb142d56.tar.xz
wireguard-linux-7790bccd7bac3af28bf044e188215041eb142d56.zip
ASoC: ti: ams-delta: Allow it to be test compiled
The driver is now built only when MACH_AMS_DELTA is selected, which requires a very specific selection of ARCH settings. As a consequence, it gets very little attention from build-bots, if not none. Drop the driver dependency on <asm/mach-types.h>, no longer required since conversion to snd_soc_register_card() and drop of machine_is_ams_delta(). With that in place, allow the driver to be built in any environment as long as COMPILE_TEST is selected. Take care of not selecting SND_SOC_OMAP_MCBSP if COMMON_CLK is not selected. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Link: https://lore.kernel.org/r/20231008135601.542356-1-jmkrzyszt@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/ti/Kconfig5
-rw-r--r--sound/soc/ti/ams-delta.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig
index 593be22503b5..e22e41af3226 100644
--- a/sound/soc/ti/Kconfig
+++ b/sound/soc/ti/Kconfig
@@ -125,8 +125,9 @@ config SND_SOC_OMAP_ABE_TWL6040
config SND_SOC_OMAP_AMS_DELTA
tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
- depends on MACH_AMS_DELTA && TTY
- select SND_SOC_OMAP_MCBSP
+ depends on MACH_AMS_DELTA || COMPILE_TEST
+ depends on TTY
+ select SND_SOC_OMAP_MCBSP if COMMON_CLK
select SND_SOC_CX20442
help
Say Y or M if you want to add support for SoC audio device
diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c
index 9c2cd993763a..b32cc03dc1c2 100644
--- a/sound/soc/ti/ams-delta.c
+++ b/sound/soc/ti/ams-delta.c
@@ -16,8 +16,6 @@
#include <sound/soc.h>
#include <sound/jack.h>
-#include <asm/mach-types.h>
-
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h"