From: Nícolas F. R. A. Prado Date: Wed, 7 May 2025 20:14:14 +0000 (-0400) Subject: ASoC: mediatek: mt8188-mt6359: Depend on MT6359_ACCDET set or disabled X-Git-Tag: v6.15~20^2~3^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7e3ec4e17e27420ebe976c7714881b64c28d63b;p=thirdparty%2Flinux.git ASoC: mediatek: mt8188-mt6359: Depend on MT6359_ACCDET set or disabled Commit 0116a7d84b32 ("ASoC: mediatek: mt6359: Add stub for mt6359_accdet_enable_jack_detect") added a stub for mt6359_accdet_enable_jack_detect() in order to allow the mt8188-mt6359 driver to be enabled without requiring the mt6359-accdet to also be enabled, since it is not always needed. However, in the case that CONFIG_SND_SOC_MT8188_MT6359=y and CONFIG_SND_SOC_MT6359_ACCDET=m, a link error will happen, which commit b19fa45715ce ("ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET") solved by selecting CONFIG_SND_SOC_MT6359_ACCDET. In order to not require CONFIG_SND_SOC_MT6359_ACCDET as originally intended, but also prevent the link error, depend on ACCDET being enabled or disabled (which will force MT8188_MT6359=m if MT6359_ACCDET=m). Fixes: f35d834d67ad ("ASoC: mediatek: mt8188-mt6359: Add accdet headset jack detect support") Fixes: b19fa45715ce ("ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET") Suggested-by: Arnd Bergmann Signed-off-by: Nícolas F. R. A. Prado Reviewed-by: AngeloGioacchino Del Regno Acked-by: Arnd Bergmann Link: https://patch.msgid.link/20250507-mt8188-mt6359-accdet-depend-v1-1-aad70ce62964@collabora.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index e148d4d941601..90e367586493d 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -228,8 +228,8 @@ config SND_SOC_MT8188 config SND_SOC_MT8188_MT6359 tristate "ASoC Audio driver for MT8188 with MT6359 and I2S codecs" depends on SND_SOC_MT8188 && MTK_PMIC_WRAP + depends on SND_SOC_MT6359_ACCDET || !SND_SOC_MT6359_ACCDET depends on I2C - select SND_SOC_MT6359_ACCDET select SND_SOC_MT6359 select SND_SOC_HDMI_CODEC select SND_SOC_DMIC