[PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The driver support was added without selecting the codec, which leads to
a link failure:

aarch64-linux-ld: sound/soc/mediatek/mt8188/mt8188-mt6359.o: in function `mt8188_mt6359_init':
mt8188-mt6359.c:(.text+0x19f0): undefined reference to `mt6359_accdet_enable_jack_detect'

Fixes: f35d834d67ad ("ASoC: mediatek: mt8188-mt6359: Add accdet headset jack detect support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/soc/mediatek/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig
index 3033e2d3fe16..e148d4d94160 100644
--- a/sound/soc/mediatek/Kconfig
+++ b/sound/soc/mediatek/Kconfig
@@ -229,6 +229,7 @@ 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 I2C
+	select SND_SOC_MT6359_ACCDET
 	select SND_SOC_MT6359
 	select SND_SOC_HDMI_CODEC
 	select SND_SOC_DMIC
-- 
2.39.5

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[AngeloGioacchino Del Regno]

Il 05/05/25 07:20, Arnd Bergmann ha scritto:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The driver support was added without selecting the codec, which leads to
> a link failure:
> 
> aarch64-linux-ld: sound/soc/mediatek/mt8188/mt8188-mt6359.o: in function `mt8188_mt6359_init':
> mt8188-mt6359.c:(.text+0x19f0): undefined reference to `mt6359_accdet_enable_jack_detect'
> 
> Fixes: f35d834d67ad ("ASoC: mediatek: mt8188-mt6359: Add accdet headset jack detect support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[Mark Brown]

On Mon, 05 May 2025 07:20:52 +0200, Arnd Bergmann wrote:
> The driver support was added without selecting the codec, which leads to
> a link failure:
> 
> aarch64-linux-ld: sound/soc/mediatek/mt8188/mt8188-mt6359.o: in function `mt8188_mt6359_init':
> mt8188-mt6359.c:(.text+0x19f0): undefined reference to `mt6359_accdet_enable_jack_detect'
> 
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET
      commit: b19fa45715ce9cfcc597ed140df31115e969b39d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[Nícolas F. R. A. Prado]

On Mon, May 05, 2025 at 07:20:52AM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The driver support was added without selecting the codec, which leads to
> a link failure:
> 
> aarch64-linux-ld: sound/soc/mediatek/mt8188/mt8188-mt6359.o: in function `mt8188_mt6359_init':
> mt8188-mt6359.c:(.text+0x19f0): undefined reference to `mt6359_accdet_enable_jack_detect'

Hm, I cannot seem to reproduce this. I just tried to build on today's next with
CONFIG_SND_SOC_MT6359_ACCDET disabled and have tried
CONFIG_SND_SOC_MT8188_MT6359 both =m and =y, but in both cases it compiles fine.

I wonder if somehow your tree was missing "ASoC: mediatek: mt6359: Add stub for
mt6359_accdet_enable_jack_detect" [1], or if it's due to a difference in
compiler versions used...

(I'm using gcc-linaro-12.3.1-2023.06-x86_64_aarch64-linux-gnu)

Thanks,
Nícolas

[1] https://lore.kernel.org/all/20250306-mt8188-accdet-v3-3-7828e835ff4b@collabora.com/

> 
> Fixes: f35d834d67ad ("ASoC: mediatek: mt8188-mt6359: Add accdet headset jack detect support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  sound/soc/mediatek/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig
> index 3033e2d3fe16..e148d4d94160 100644
> --- a/sound/soc/mediatek/Kconfig
> +++ b/sound/soc/mediatek/Kconfig
> @@ -229,6 +229,7 @@ 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 I2C
> +	select SND_SOC_MT6359_ACCDET
>  	select SND_SOC_MT6359
>  	select SND_SOC_HDMI_CODEC
>  	select SND_SOC_DMIC
> -- 
> 2.39.5
> 

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[Arnd Bergmann]

On Wed, May 7, 2025, at 18:41, Nícolas F. R. A. Prado wrote:
> On Mon, May 05, 2025 at 07:20:52AM +0200, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>> 
>> The driver support was added without selecting the codec, which leads to
>> a link failure:
>> 
>> aarch64-linux-ld: sound/soc/mediatek/mt8188/mt8188-mt6359.o: in function `mt8188_mt6359_init':
>> mt8188-mt6359.c:(.text+0x19f0): undefined reference to `mt6359_accdet_enable_jack_detect'
>
> Hm, I cannot seem to reproduce this. I just tried to build on today's next with
> CONFIG_SND_SOC_MT6359_ACCDET disabled and have tried
> CONFIG_SND_SOC_MT8188_MT6359 both =m and =y, but in both cases it compiles fine.

The config that failed for me had CONFIG_SND_SOC_MT6359_ACCDET.

> I wonder if somehow your tree was missing "ASoC: mediatek: mt6359: Add stub for
> mt6359_accdet_enable_jack_detect" [1]

> https://lore.kernel.org/all/20250306-mt8188-accdet-v3-3-7828e835ff4b@collabora.com/

I had not seen that patch, but with that applied, my patch needs to
be revised as well. If the idea is that CONFIG_SND_SOC_MT8188_MT6359
can work correctly without CONFIG_SND_SOC_MT6359_ACCDET, it should be

      depends on SND_SOC_MT6359_ACCDET || !SND_SOC_MT6359_ACCDET

in order to force SND_SOC_MT8188_MT6359=m if the ACCDET portion
is in a loadable module.

If SND_SOC_MT8188_MT6359 requires SND_SOC_MT6359_ACCDET to work
correctly, then my original patch is still needed and yours
should be reverted.

     Arnd

Re: [PATCH] ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET

[Nícolas F. R. A. Prado]

On Wed, May 07, 2025 at 07:10:54PM +0200, Arnd Bergmann wrote:
> On Wed, May 7, 2025, at 18:41, Nícolas F. R. A. Prado wrote:
> > On Mon, May 05, 2025 at 07:20:52AM +0200, Arnd Bergmann wrote:
> >> From: Arnd Bergmann <arnd@arndb.de>
> >> 
> >> The driver support was added without selecting the codec, which leads to
> >> a link failure:
> >> 
> >> aarch64-linux-ld: sound/soc/mediatek/mt8188/mt8188-mt6359.o: in function `mt8188_mt6359_init':
> >> mt8188-mt6359.c:(.text+0x19f0): undefined reference to `mt6359_accdet_enable_jack_detect'
> >
> > Hm, I cannot seem to reproduce this. I just tried to build on today's next with
> > CONFIG_SND_SOC_MT6359_ACCDET disabled and have tried
> > CONFIG_SND_SOC_MT8188_MT6359 both =m and =y, but in both cases it compiles fine.
> 
> The config that failed for me had CONFIG_SND_SOC_MT6359_ACCDET.
> 
> > I wonder if somehow your tree was missing "ASoC: mediatek: mt6359: Add stub for
> > mt6359_accdet_enable_jack_detect" [1]
> 
> > https://lore.kernel.org/all/20250306-mt8188-accdet-v3-3-7828e835ff4b@collabora.com/
> 
> I had not seen that patch, but with that applied, my patch needs to
> be revised as well. If the idea is that CONFIG_SND_SOC_MT8188_MT6359
> can work correctly without CONFIG_SND_SOC_MT6359_ACCDET, it should be
> 
>       depends on SND_SOC_MT6359_ACCDET || !SND_SOC_MT6359_ACCDET
> 
> in order to force SND_SOC_MT8188_MT6359=m if the ACCDET portion
> is in a loadable module.

Ah indeed, that's it. The stub was added to allow MT8188_MT6359 to work without 
ACCDET, but we still need to prevent the MT8188_MT6359=y and ACCDET=m case, like
you suggest. I can send that patch right away.

Thanks,
Nícolas