From: Arnd Bergmann <arnd@arndb.de>
To: Mark Brown <broonie@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
Jarkko Nikula <jarkko.nikula@bitmer.com>,
Liam Girdwood <lgirdwood@gmail.com>,
alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ASoC: fix ABE_TWL6040 dependency
Date: Mon, 13 Jun 2016 17:39:43 +0200 [thread overview]
Message-ID: <1465832422-2998958-2-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1465832422-2998958-1-git-send-email-arnd@arndb.de>
The TWL6040 ASoC support has recently started turning on CLK_TWL6040,
but that fails to build when CONFIG_COMMON_CLK is disabled:
warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects CLK_TWL6040 which has unmet direct dependencies (COMMON_CLK && TWL6040_CORE)
0xF18E38F6 Thu Jun 9 18:57:32 CEST 2016 failed
In file included from ../include/linux/clocksource.h:18:0,
from ../drivers/clocksource/timer-nps.c:34:
../include/linux/of.h:1005:20: error: comparison of distinct pointer types lacks a cast [-Werror]
.data = (fn == (fn_type)NULL) ? fn : fn }
^
This adds a dependency to avoid the invalid configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 443500a3927a ("ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040")
---
sound/soc/omap/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 5c471d920898..f5451c78ede5 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -100,7 +100,7 @@ config SND_OMAP_SOC_OMAP_TWL4030
config SND_OMAP_SOC_OMAP_ABE_TWL6040
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
- depends on TWL6040_CORE && SND_OMAP_SOC
+ depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK
depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
select SND_OMAP_SOC_DMIC
select SND_OMAP_SOC_MCPDM
--
2.7.0
next prev parent reply other threads:[~2016-06-13 15:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
2016-06-13 15:39 ` Arnd Bergmann [this message]
2016-06-13 16:54 ` Applied "ASoC: fix ABE_TWL6040 dependency" to the asoc tree Mark Brown
2016-06-13 16:54 ` Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: cs53l30: include gpio/consumer.h Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: cs53l30: include gpio/consumer.h" to the asoc tree Mark Brown
2016-06-13 16:54 ` Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: pcm1681/pcm1791: fix typo in declaration" to the asoc tree Mark Brown
2016-06-13 16:54 ` Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: rcar: fix 'const static' variables Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: rcar: fix 'const static' variables" to the asoc tree Mark Brown
2016-06-13 16:54 ` Mark Brown
2016-06-13 16:54 ` Applied "ASoC: wm8985: add i2c dependency" " Mark Brown
2016-06-13 16:54 ` 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=1465832422-2998958-2-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=jarkko.nikula@bitmer.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=peter.ujfalusi@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.