]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: Intel: Kconfig: select SND_SOC_SDCA by SND_SOC_ACPI_INTEL_SDCA_QUIRKS
authorBard Liao <yung-chuan.liao@linux.intel.com>
Wed, 6 Nov 2024 05:58:10 +0000 (13:58 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 6 Nov 2024 14:15:15 +0000 (14:15 +0000)
SND_SOC_SDCA can't be optional when SND_SOC_ACPI_INTEL_SDCA_QUIRKS is
selected. IS_REACHABLE can prevent the link error. However it is not
suitable for this case. When CONFIG_SND_SOC_ACPI_INTEL_SDCA_QUIRKS is
Y and CONFIG_SND_SOC_SDCA is M, the SDCA helpers will be empty and
return false. But we need the helpers to do their jobs whenSND_SOC_SDCA
is M.
IOW, the SDCA library is not optional for Intel platforms where the
SDCA_QUIRK is selected.
Also, make SND_SOC_SDCA invisible. SND_SOC_SDCA should be selected if
a device supports SDCA. User should not unselect it.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202411021722.DiX1Y5sf-lkp@intel.com/
Suggested-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20241106055810.10123-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/Kconfig
sound/soc/sdca/Kconfig

index f644e94234280c2b33ebe51cbefb3111899e64be..46b45f390ae9eabc7192c496bcafff88185466e2 100644 (file)
@@ -78,7 +78,7 @@ config SND_SOC_ACPI_INTEL_MATCH
 
 config SND_SOC_ACPI_INTEL_SDCA_QUIRKS
        tristate
-       imply SND_SOC_SDCA
+       select SND_SOC_SDCA
 
 endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
 
index 07f6822fa614f36edac756398356c9b85b0c6f68..ee20b9914aa1faa512c88f64739d8654e76b00b1 100644 (file)
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 config SND_SOC_SDCA
-       tristate "ASoC SDCA library"
+       tristate
        depends on ACPI
        help
          This option enables support for the MIPI SoundWire Device