torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code
85dc28fa4e
linux/sound/soc/intel/boards
History
Nathan Chancellor b3dded7e2f
ASoC: Intel: boards: Fix CONFIG_SND_SOC_SDW_MOCKUP select 
When CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is enabled without
CONFIG_EXPERT, there is a Kconfig warning about unmet dependencies:

WARNING: unmet direct dependencies detected for SND_SOC_SDW_MOCKUP
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] &&
EXPERT [=n] && SOUNDWIRE [=y]
  Selected by [y]:
  - SND_SOC_INTEL_SOUNDWIRE_SOF_MACH [=y] && ...

Selecting a symbol does not account for dependencies. There are three
ways to resolve this:

1. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select
   CONFIG_SND_SOC_SDW_MOCKUP only if CONFIG_EXPERT is set.

2. Make CONFIG_SND_SOC_SDW_MOCKUP's prompt depend on CONFIG_EXPERT so
   that it can be selected by options that only depend on
   CONFIG_SOUNDWIRE but still appear as a prompt to the user when
   CONFIG_EXPERT is set.

3. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH imply
   CONFIG_SND_SOC_SDW_MOCKUP, which will select
   CONFIG_SND_SOC_SDW_MOCKUP when its dependencies are enabled but still
   allow the user to disable it.

Go with the third option as it gives the most flexibility while
retaining the original intent of the select.

Fixes: 0ccac3bcf3 ("ASoC: Intel: boards: sof_sdw: add SoundWire mockup codecs for tests")
Suggested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20210902181217.2958966-1-nathan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
2021-09-03 13:31:45 +01:00
..
bdw-rt5650.c ASoC: Intel: broadwell: set card and driver name dynamically 2020-11-19 18:24:42 +00:00
bdw-rt5677.c ASoC: Intel: bdw-rt5677: remove unnecessary oom message 2021-06-17 16:17:25 +01:00
broadwell.c ASoC: Intel: broadwell: set card and driver name dynamically 2020-11-19 18:24:42 +00:00
bxt_da7219_max98357a.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
bxt_rt298.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
bytcht_cx2072x.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00
bytcht_da7213.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00
bytcht_es8316.c ASoC: Intel: boards: use software node API in Atom boards 2021-08-13 16:50:43 +01:00
bytcht_nocodec.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00
bytcr_rt5640.c ASoC: Intel: bytcr_rt5640: Make rt5640_jack_gpio/rt5640_jack2_gpio static 2021-08-25 14:15:45 +01:00
bytcr_rt5651.c ASoC: Intel: boards: use software node API in Atom boards 2021-08-13 16:50:43 +01:00
bytcr_wm5102.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00
cht_bsw_max98090_ti.c ASoC: Intel: byt/cht: set pm ops dynamically 2020-11-19 18:24:38 +00:00
cht_bsw_nau8824.c ASoC: Intel: cht_bsw_nau8824: Move snd_soc_dai_set_tdm_slot call to cht_codec_fixup 2021-01-12 14:11:59 +00:00
cht_bsw_rt5645.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00
cht_bsw_rt5672.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00
cml_rt1011_rt5682.c ASoC: Intel: boards: handle hda-dsp-common as a module 2021-05-10 13:04:18 +01:00
ehl_rt5660.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
glk_rt5682_max98357a.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
haswell.c ASoC: Intel: haswell: Add missing pm_ops 2020-12-17 14:24:43 +00:00
hda_dsp_common.c ASoC: Intel: boards: handle hda-dsp-common as a module 2021-05-10 13:04:18 +01:00
hda_dsp_common.h ASoC: Intel: hda_dsp_common: use static function in conditional block 2020-09-23 18:47:59 +01:00
kbl_da7219_max98357a.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
kbl_da7219_max98927.c ASoC: Intel: kbl_da7219_max98927: Fix format selection for max98373 2021-08-23 16:39:55 +01:00
kbl_rt5660.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
kbl_rt5663_max98927.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
kbl_rt5663_rt5514_max98927.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
Kconfig ASoC: Intel: boards: Fix CONFIG_SND_SOC_SDW_MOCKUP select 2021-09-03 13:31:45 +01:00
Makefile ASoC: Intel: add sof-cs42l42 machine driver 2021-05-10 13:04:25 +01:00
skl_hda_dsp_common.c ASoC: SOF/Intel: clarify SPDX license with GPL-2.0-only 2020-05-01 17:45:24 +01:00
skl_hda_dsp_common.h ASoC: intel/skl/hda - fix probe regression on systems without i915 2020-07-22 13:34:24 +01:00
skl_hda_dsp_generic.c ASoC: Intel: boards: handle hda-dsp-common as a module 2021-05-10 13:04:18 +01:00
skl_nau88l25_max98357a.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
skl_nau88l25_ssm4567.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
skl_rt286.c ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables 2021-06-22 12:47:09 +01:00
sof_cs42l42.c ASoC: Intel: sof_cs42l42: add support for jsl_cs4242_mx98360a 2021-07-14 13:30:36 +01:00
sof_da7219_max98373.c ASoC: Intel: sof_da7219_mx98360a: fail to initialize soundcard 2021-07-26 18:57:12 +01:00
sof_maxim_common.c ASoC: Intel: maxim-common: support max98360a 2021-07-14 13:30:35 +01:00
sof_maxim_common.h ASoC: Intel: maxim-common: support max98360a 2021-07-14 13:30:35 +01:00
sof_pcm512x.c ASoC: Intel: update sof_pcm512x quirks 2021-08-03 18:26:11 +01:00
sof_realtek_common.c ASoC: Intel: sof_rt5682: Add ALC1015Q-VB speaker amp support 2021-03-18 13:54:45 +00:00
sof_realtek_common.h ASoC: Intel: sof_rt5682: Add ALC1015Q-VB speaker amp support 2021-03-18 13:54:45 +00:00
sof_rt5682.c ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant 2021-08-03 18:26:10 +01:00
sof_sdw_common.h ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_dmic.c ASoC: Intel: sof_sdw: clean-up inclusion of header files 2020-08-24 13:41:36 +01:00
sof_sdw_hdmi.c ASoC: Intel: sof_sdw: remove hdac-hdmi support 2021-06-22 12:47:03 +01:00
sof_sdw_max98373.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_rt700.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_rt711_sdca.c ASoC: Intel: use software node API in SoundWire machines 2021-08-13 16:50:41 +01:00
sof_sdw_rt711.c ASoC: Intel: use software node API in SoundWire machines 2021-08-13 16:50:41 +01:00
sof_sdw_rt715_sdca.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_rt715.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_rt1308.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_rt1316.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw_rt5682.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_sdw.c ASoC: Intel: sof_sdw: pass card information to init/exit functions 2021-08-13 16:50:40 +01:00
sof_wm8804.c ASoC: Intel: boards: remove .nonatomic for BE dailinks 2021-05-10 13:04:21 +01:00