alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org, Arnd Bergmann <arnd@arndb.de>,
	Sangbeom Kim <sbkim73@samsung.com>,
	Jassi Brar <jassisinghbrar@gmail.com>,
	linux-kernel@vger.kernel.org, Liam Girdwood <lrg@ti.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/6] ASoC: samsung: fix Kconfig dependencies
Date: Sun,  2 Oct 2011 22:28:03 +0200	[thread overview]
Message-ID: <1317587284-2776-6-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>

SND_SOC_WM8994 can only be selected if the respective MFD driver is
present.

SND_SAMSUNG_AC97 must not be builtin if SND_SOC_ALL_CODECS is
set to building all drivers as modules.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>
---
 sound/soc/samsung/Kconfig |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 65f980e..cb63cd0 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -25,6 +25,7 @@ config SND_SAMSUNG_PCM
 
 config SND_SAMSUNG_AC97
 	tristate
+	depends on SND_SOC_ALL_CODECS=n || SND_SOC_ALL_CODECS
 	select SND_SOC_AC97_BUS
 
 config SND_SAMSUNG_SPDIF
@@ -64,6 +65,7 @@ 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)
+	depends on MFD_WM8994
 	select SND_SOC_WM8994
 	select SND_SAMSUNG_I2S
 	help
@@ -151,6 +153,7 @@ config SND_SOC_GONI_AQUILA_WM8994
 	tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
 	depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
 	select SND_SAMSUNG_I2S
+	depends on MFD_WM8994
 	select SND_SOC_WM8994
 	help
 	  Say Y if you want to add support for SoC audio on goni or aquila
@@ -174,6 +177,7 @@ 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)
+	depends on MFD_WM8994
 	select SND_SOC_WM8994
 	select SND_SAMSUNG_PCM
 	help
-- 
1.7.5.4

  parent reply	other threads:[~2011-10-02 20:29 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-02 20:27 [PATCH 0/6] ASoC fixes from ARM randconfig builds Arnd Bergmann
2011-10-02 20:27 ` [PATCH 1/6] ASoC: codecs/wm8682: use __devexit_p Arnd Bergmann
2011-10-02 20:36   ` Mark Brown
2011-10-02 20:28 ` [PATCH 2/6] ASoC: codecs: AK4641 depends on GPIOLIB Arnd Bergmann
2011-10-02 20:41   ` Mark Brown
2011-10-02 20:53     ` Arnd Bergmann
2011-10-02 21:27       ` Mark Brown
2011-10-03 10:59         ` Arnd Bergmann
2011-10-03 13:45     ` Russell King - ARM Linux
2011-10-03 14:35       ` Mark Brown
2011-10-03 14:47         ` [alsa-devel] " Arnd Bergmann
2011-10-03 15:20           ` Mark Brown
2011-10-03 16:19             ` Arnd Bergmann
2011-10-03 16:34               ` Mark Brown
2011-10-02 20:28 ` [PATCH 3/6] ASoC: imx: eukrea_tlv320 needs i2c Arnd Bergmann
2011-10-02 20:49   ` Mark Brown
2011-10-02 20:28 ` [PATCH 4/6] ASoC: sh: use correct __iomem annotations Arnd Bergmann
2011-10-02 20:50   ` Mark Brown
2011-10-02 21:20     ` Arnd Bergmann
2011-10-02 20:28 ` Arnd Bergmann [this message]
2011-10-02 20:47   ` [PATCH 5/6] ASoC: samsung: fix Kconfig dependencies Mark Brown
2011-10-02 21:14     ` Arnd Bergmann
2011-10-02 21:29       ` Mark Brown
2011-10-03  6:48       ` [alsa-devel] " Sangbeom Kim
2011-10-03 11:50         ` Arnd Bergmann
2011-10-03 12:07           ` Mark Brown
2011-10-03 13:43             ` [PATCH 5/6] ASoC: samsung: wm8994 depends on mfd_wm8994 Arnd Bergmann
2011-10-03 14:08               ` Mark Brown
2011-10-03 14:35                 ` [PATCH v3] " Arnd Bergmann
2011-10-03 14:40                   ` Mark Brown
2011-10-02 20:28 ` [PATCH 6/6] ASoC: samsung: add missing __devexit_p() annotations Arnd Bergmann
2011-10-02 20:48   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317587284-2776-6-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=jassisinghbrar@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=sbkim73@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).