projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b5999b)
ASoC: samsung: WM8994 depends on MFD_WM8994
authorArnd Bergmann <arnd@arndb.de>
Mon, 3 Oct 2011 14:35:46 +0000 (16:35 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 3 Oct 2011 14:39:58 +0000 (15:39 +0100)
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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/samsung/Kconfig patch | blob | blame | history

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index dd3b3eac080565d7b55c4fe150b97b3f2fc79527..53aaa69eda0365c40a909573d7cbb23901311d75 100644 (file)
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -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