diff options
| -rw-r--r-- | sound/soc/amd/acp/Kconfig | 4 | ||||
| -rw-r--r-- | sound/soc/amd/acp/amd-acp70-acpi-match.c | 2 | ||||
| -rw-r--r-- | sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h | 11 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index b17aaf2c6ccb..977e4f2a7a70 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -15,8 +15,8 @@ config SND_SOC_AMD_ACP_COMMON config SND_SOC_ACPI_AMD_MATCH tristate - select SND_SOC_ACPI_AMD_SDCA_QUIRKS - select SND_SOC_ACPI if ACPI + select SND_SOC_ACPI_AMD_SDCA_QUIRKS if SND_SOC_SDCA + select SND_SOC_ACPI if ACPI config SND_SOC_ACPI_AMD_SDCA_QUIRKS tristate diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c index fa39f18578ca..c5f42bd79548 100644 --- a/sound/soc/amd/acp/amd-acp70-acpi-match.c +++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c @@ -376,4 +376,6 @@ EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sof_sdw_machines); MODULE_DESCRIPTION("AMD ACP7.0 & ACP7.1 tables and support for ACPI enumeration"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); +#if IS_ENABLED(CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS) MODULE_IMPORT_NS("SND_SOC_ACPI_AMD_SDCA_QUIRKS"); +#endif diff --git a/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h b/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h index 7e345a236da1..0e644e71e76f 100644 --- a/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h +++ b/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h @@ -9,6 +9,17 @@ #ifndef _SND_SOC_ACPI_AMD_SDCA_QUIRKS #define _SND_SOC_ACPI_AMD_SDCA_QUIRKS +#if IS_ENABLED(CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS) + bool snd_soc_acpi_amd_sdca_is_device_rt712_vb(void *arg); +#else + +static inline bool snd_soc_acpi_amd_sdca_is_device_rt712_vb(void *arg) +{ + return false; +} + +#endif + #endif |