Skip to content

Commit b7e3ec4

Browse files
nfrapradobroonie
authored andcommitted
ASoC: mediatek: mt8188-mt6359: Depend on MT6359_ACCDET set or disabled
Commit 0116a7d ("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 b19fa45 ("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: f35d834 ("ASoC: mediatek: mt8188-mt6359: Add accdet headset jack detect support") Fixes: b19fa45 ("ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET") Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: Nícolas F. R. A. Prado <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Link: https://patch.msgid.link/20250507-mt8188-mt6359-accdet-depend-v1-1-aad70ce62964@collabora.com Signed-off-by: Mark Brown <[email protected]>
1 parent b19fa45 commit b7e3ec4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sound/soc/mediatek/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ config SND_SOC_MT8188
228228
config SND_SOC_MT8188_MT6359
229229
tristate "ASoC Audio driver for MT8188 with MT6359 and I2S codecs"
230230
depends on SND_SOC_MT8188 && MTK_PMIC_WRAP
231+
depends on SND_SOC_MT6359_ACCDET || !SND_SOC_MT6359_ACCDET
231232
depends on I2C
232-
select SND_SOC_MT6359_ACCDET
233233
select SND_SOC_MT6359
234234
select SND_SOC_HDMI_CODEC
235235
select SND_SOC_DMIC

0 commit comments

Comments
 (0)