mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 15:26:21 +09:00
e60e53e685
commit b6aa06de7757667bac88997a8807b143b8436035 upstream.
When building on allyesconfig kernel for a NO_DMA=y platform (e.g.
Sun-3), CONFIG_SND_SOC_QCOM_COMMON=y, but CONFIG_SND_SOC_QDSP6_AFE=n,
leading to a link failure:
sound/soc/qcom/common.o: In function `qcom_snd_parse_of':
common.c:(.text+0x2e2): undefined reference to `q6afe_is_rx_port'
While SND_SOC_QDSP6 depends on HAS_DMA, SND_SOC_MSM8996 and SND_SOC_SDM845
don't, so the following warning is seen:
WARNING: unmet direct dependencies detected for SND_SOC_QDSP6
Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && HAS_DMA [=n]
Selected by [y]:
- SND_SOC_MSM8996 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y]
- SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && CROS_EC [=y] && I2C [=y] && SOUNDWIRE [=y]
Until recently, this warning was harmless (from a compile-testing
point-of-view), but the new user of q6afe_is_rx_port() turned this into
a hard failure.
As the QDSP6 driver itself builds fine if NO_DMA=y, and it depends on
QCOM_APR (which in turns depends on ARCH_QCOM || COMPILE_TEST), it is
safe to increase compile testing coverage. Hence fix the link failure
by dropping the HAS_DMA dependency of SND_SOC_QDSP6.
Fixes: a2120089251f1fe2 ("ASoC: qcom: common: set correct directions for dailinks")
Fixes: 6b1687bf76 ("ASoC: qcom: add sdm845 sound card support")
Fixes: a6f933f63f ("ASoC: qcom: apq8096: Add db820c machine driver")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200629122443.21736-1-geert@linux-m68k.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
112 lines
2.7 KiB
Plaintext
112 lines
2.7 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
config SND_SOC_QCOM
|
|
tristate "ASoC support for QCOM platforms"
|
|
depends on ARCH_QCOM || COMPILE_TEST
|
|
help
|
|
Say Y or M if you want to add support to use audio devices
|
|
in Qualcomm Technologies SOC-based platforms.
|
|
|
|
config SND_SOC_LPASS_CPU
|
|
tristate
|
|
select REGMAP_MMIO
|
|
|
|
config SND_SOC_LPASS_PLATFORM
|
|
tristate
|
|
select REGMAP_MMIO
|
|
|
|
config SND_SOC_LPASS_IPQ806X
|
|
tristate
|
|
select SND_SOC_LPASS_CPU
|
|
select SND_SOC_LPASS_PLATFORM
|
|
|
|
config SND_SOC_LPASS_APQ8016
|
|
tristate
|
|
select SND_SOC_LPASS_CPU
|
|
select SND_SOC_LPASS_PLATFORM
|
|
|
|
config SND_SOC_STORM
|
|
tristate "ASoC I2S support for Storm boards"
|
|
depends on SND_SOC_QCOM
|
|
select SND_SOC_LPASS_IPQ806X
|
|
select SND_SOC_MAX98357A
|
|
help
|
|
Say Y or M if you want add support for SoC audio on the
|
|
Qualcomm Technologies IPQ806X-based Storm board.
|
|
|
|
config SND_SOC_APQ8016_SBC
|
|
tristate "SoC Audio support for APQ8016 SBC platforms"
|
|
depends on SND_SOC_QCOM
|
|
select SND_SOC_LPASS_APQ8016
|
|
help
|
|
Support for Qualcomm Technologies LPASS audio block in
|
|
APQ8016 SOC-based systems.
|
|
Say Y if you want to use audio devices on MI2S.
|
|
|
|
config SND_SOC_QCOM_COMMON
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_COMMON
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_CORE
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_AFE
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_AFE_DAI
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_ADM
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_ROUTING
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_ASM
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6_ASM_DAI
|
|
select SND_SOC_COMPRESS
|
|
tristate
|
|
|
|
config SND_SOC_QDSP6
|
|
tristate "SoC ALSA audio driver for QDSP6"
|
|
depends on QCOM_APR
|
|
select SND_SOC_QDSP6_COMMON
|
|
select SND_SOC_QDSP6_CORE
|
|
select SND_SOC_QDSP6_AFE
|
|
select SND_SOC_QDSP6_AFE_DAI
|
|
select SND_SOC_QDSP6_ADM
|
|
select SND_SOC_QDSP6_ROUTING
|
|
select SND_SOC_QDSP6_ASM
|
|
select SND_SOC_QDSP6_ASM_DAI
|
|
help
|
|
To add support for MSM QDSP6 Soc Audio.
|
|
This will enable sound soc platform specific
|
|
audio drivers. This includes q6asm, q6adm,
|
|
q6afe interfaces to DSP using apr.
|
|
|
|
config SND_SOC_MSM8996
|
|
tristate "SoC Machine driver for MSM8996 and APQ8096 boards"
|
|
depends on QCOM_APR
|
|
select SND_SOC_QDSP6
|
|
select SND_SOC_QCOM_COMMON
|
|
help
|
|
Support for Qualcomm Technologies LPASS audio block in
|
|
APQ8096 SoC-based systems.
|
|
Say Y if you want to use audio device on this SoCs
|
|
|
|
config SND_SOC_SDM845
|
|
tristate "SoC Machine driver for SDM845 boards"
|
|
depends on QCOM_APR && CROS_EC && I2C
|
|
select SND_SOC_QDSP6
|
|
select SND_SOC_QCOM_COMMON
|
|
select SND_SOC_RT5663
|
|
select SND_SOC_MAX98927
|
|
select SND_SOC_CROS_EC_CODEC
|
|
help
|
|
To add support for audio on Qualcomm Technologies Inc.
|
|
SDM845 SoC-based systems.
|
|
Say Y if you want to use audio device on this SoCs.
|