ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable

the Intel kbuild bot reports a link failure when IOSF_MBI is built-in
but the Merrifield driver is configured as a module. The
soc-intel-quirks.h is included for Merrifield platforms, but IOSF_MBI
is not selected for that platform.

ld.lld: error: undefined symbol: iosf_mbi_read
>>> referenced by atom.c
>>>               sound/soc/sof/intel/atom.o:(atom_machine_select) in archive vmlinux.a

This patch forces the use of the fallback static inline when IOSF_MBI is not reachable.

Fixes: 536cfd2f37 ("ASoC: Intel: use common helpers to detect CPUs")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202407160704.zpdhJ8da-lkp@intel.com/
Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20240722083002.10800-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2024-07-22 10:30:02 +02:00 committed by Mark Brown
parent f2038c12e8
commit 9931f7d5d2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0

View File

@ -11,7 +11,7 @@
#include <linux/platform_data/x86/soc.h> #include <linux/platform_data/x86/soc.h>
#if IS_ENABLED(CONFIG_X86) #if IS_REACHABLE(CONFIG_IOSF_MBI)
#include <linux/dmi.h> #include <linux/dmi.h>
#include <asm/iosf_mbi.h> #include <asm/iosf_mbi.h>