]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: qcom: select correct WCD938X config for SC7280
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Fri, 4 Mar 2022 16:09:34 +0000 (16:09 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 7 Mar 2022 13:14:55 +0000 (13:14 +0000)
SC7280 config selected WCD938X instead of WCD938X_SDW Soundwire codecs.
WCD938X_SDW actually selects WCD938X, so directly selecting WCD938X results
in unmet dependencies and below warning

WARNING: unmet direct dependencies detected for SND_SOC_WCD938X
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=m]
 && SND_SOC_WCD938X_SDW [=n] && (SOUNDWIRE [=n] || !SOUNDWIRE [=n])
  Selected by [m]:
  - SND_SOC_SC7280 [=m] && SOUND [=y] && !UML && SND [=y]
 && SND_SOC [=m] && SND_SOC_QCOM [=m] && (I2C [=y] && SOUNDWIRE [=n] ||
 COMPILE_TEST [=y])

Fix this issue by selecting WCD SoundWire codecs instead of component driver.

Fixes: 57350bd41c3a ("ASoC: qcom: SC7280: Add machine driver")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220304160934.32010-1-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/Kconfig

index 0cd0dae5c545e5b92d2f66580f5e441b36c2fa5e..82f5eafb2f6c20cb17902840fbeadab2ac2d8c48 100644 (file)
@@ -193,7 +193,7 @@ config SND_SOC_SC7280
        select SND_SOC_QCOM_COMMON
        select SND_SOC_LPASS_SC7280
        select SND_SOC_MAX98357A
-       select SND_SOC_WCD938X
+       select SND_SOC_WCD938X_SDW
        select SND_SOC_LPASS_MACRO_COMMON
        select SND_SOC_LPASS_RX_MACRO
        select SND_SOC_LPASS_TX_MACRO