Commit 61e49bf1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: samsung: WM8994 depends on MFD_WM8994 



Any driver that selects SND_SOC_WM8994 should also make sure that
MFD_WM8994 is set, since the codec relies on the mfd code:

  sound/built-in.o: In function `wm8994_read':
  last.c:(.text+0x20160): undefined reference to `wm8994_reg_read'
  sound/built-in.o: In function `wm8994_write':
  last.c:(.text+0x20e68): undefined reference to `wm8994_reg_write'

This solves the problem by selecting the MFD driver directly
and adding extra 'depends on' statements to make sure that we
respect the dependencies of that driver.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9b5999b1

sound/soc/samsung/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ config SND_SOC_SAMSUNG_SMDK_WM8580 
config SND_SOC_SAMSUNG_SMDK_WM8994

	tristate "SoC I2S Audio support for WM8994 on SMDK"

	depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212)

	depends on I2C=y && GENERIC_HARDIRQS

	select MFD_WM8994

	select SND_SOC_WM8994

	select SND_SAMSUNG_I2S

	help
@@ -150,7 +152,9 @@ config SND_SOC_SMARTQ 
config SND_SOC_GONI_AQUILA_WM8994

	tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"

	depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)

	depends on I2C=y && GENERIC_HARDIRQS

	select SND_SAMSUNG_I2S

	select MFD_WM8994

	select SND_SOC_WM8994

	help

	  Say Y if you want to add support for SoC audio on goni or aquila
@@ -174,6 +178,8 @@ config SND_SOC_SMDK_WM8580_PCM 
config SND_SOC_SMDK_WM8994_PCM

	tristate "SoC PCM Audio support for WM8994 on SMDK"

	depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212)

	depends on I2C=y && GENERIC_HARDIRQS

	select MFD_WM8994

	select SND_SOC_WM8994

	select SND_SAMSUNG_PCM

	help