Skip to contentSkip to conversation

ASoC: Make SND_SOC_SAARB and SND_SOC_TAVOREVB3 depend on MFD_88PM860X

PATCH In review Axel Lin 2 participants 2 messages Oct 12, 2011

Subsystems (3)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: Make SND_SOC_SAARB and SND_SOC_TAVOREVB3 depend on MFD_88PM860X

In saarb_pm860x_init() and evb3_pm860x_init(), we call pm860x_hs_jack_detect() and pm860x_mic_jack_detect() which in turn calls pm860x_set_bits().
Thus make SND_SOC_SAARB and SND_SOC_TAVOREVB3 depend on MFD_88PM860X

This patch fixes below build error if CONFIG_MFD_88PM860X is not configured.

LD .tmp_vmlinux1
sound/built-in.o: In function `pm860x_write_reg_cache':
last.c:(.text+0x29e9c): undefined reference to pm860x_reg_write' sound/built-in.o: In function pm860x_set_bias_level':
last.c:(.text+0x29ecc): undefined reference to pm860x_set_bits' last.c:(.text+0x29f00): undefined reference to pm860x_reg_write' last.c:(.text+0x29f18): undefined reference to pm860x_reg_write' sound/built-in.o: In function pm860x_read_reg_cache':
last.c:(.text+0x29f40): undefined reference to pm860x_reg_read' sound/built-in.o: In function pm860x_probe':
last.c:(.text+0x2a034): undefined reference to pm860x_bulk_read' sound/built-in.o: In function pm860x_codec_handler':
last.c:(.text+0x2a344): undefined reference to pm860x_reg_read' last.c:(.text+0x2a354): undefined reference to pm860x_reg_read' sound/built-in.o: In function `pm860x_mic_jack_detect':
last.c:(.text+0x2a450): undefined reference to pm860x_set_bits' sound/built-in.o: In function pm860x_hs_jack_detect':
last.c:(.text+0x2a4d0): undefined reference to pm860x_set_bits' last.c:(.text+0x2a4f8): undefined reference to pm860x_set_bits' last.c:(.text+0x2a510): undefined reference to `pm860x_set_bits'
make: *** [.tmp_vmlinux1] Error 1

---
 sound/soc/pxa/Kconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
sound/soc/pxa/Kconfig +2 -0
index 33ebc46b..b12b4af 100644
@@ -121,6 +121,7 @@ config SND_PXA2XX_SOC_PALM27X
 config SND_SOC_SAARB
 	tristate "SoC Audio support for Marvell Saarb"
 	depends on SND_PXA2XX_SOC && MACH_SAARB
+	depends on MFD_88PM860X
 	select SND_PXA_SOC_SSP
 	select SND_SOC_88PM860X
 	help
@@ -130,6 +131,7 @@ config SND_SOC_SAARB
 config SND_SOC_TAVOREVB3
 	tristate "SoC Audio support for Marvell Tavor EVB3"
 	depends on SND_PXA2XX_SOC && MACH_TAVOREVB3
+	depends on MFD_88PM860X
 	select SND_PXA_SOC_SSP
 	select SND_SOC_88PM860X
 	help
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 4 lines · Axel Lin

In saarb_pm860x_init() and evb3_pm860x_init(), we call pm860x_hs_jack_detect() and pm860x_mic_jack_detect() which in turn calls pm860x_set_bits().
Thus make SND_SOC_SAARB and SND_SOC_TAVOREVB3 depend on MFD_88PM860X

What we just did for WM8994 was add a select of the MFD for consistency with the way the CODEC driver itself is handled.