summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-11-10 15:54:43 +0100
committerMark Brown <broonie@kernel.org>2017-11-10 21:15:14 +0000
commitc56308775b5b81683789f9ee03f009493b51e6ab (patch)
tree34c730e059f37392e97ceb9be70707f60366b16d /sound/soc/codecs/Makefile
parent7e6358ec3b6f69815a42af6203219584a80d4e22 (diff)
downloadop-kernel-dev-c56308775b5b81683789f9ee03f009493b51e6ab.zip
op-kernel-dev-c56308775b5b81683789f9ee03f009493b51e6ab.tar.gz
ASoC: rt5514: work around link error
The main rt5514 driver optionally calls into the SPI back-end to load the firmware. This causes a link error when one driver selects rt5514 as built-in and another driver selects rt5514-spi as a loadable module: sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put': rt5514.c:(.text+0xac8): undefined reference to `rt5514_spi_burst_write' As a workaround, this adds another silent symbol, to force rt5514-spi to be built-in for that configuration. I'm not overly happy with that solution, but couldn't come up with anything better. Using 'IS_REACHABLE()' would break the case that relies on the loadable module, and all other ideas would result in more complexity. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/Makefile')
-rw-r--r--sound/soc/codecs/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 77c1818..2dc42b29 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -359,6 +359,7 @@ obj-$(CONFIG_SND_SOC_RT286) += snd-soc-rt286.o
obj-$(CONFIG_SND_SOC_RT298) += snd-soc-rt298.o
obj-$(CONFIG_SND_SOC_RT5514) += snd-soc-rt5514.o
obj-$(CONFIG_SND_SOC_RT5514_SPI) += snd-soc-rt5514-spi.o
+obj-$(CONFIG_SND_SOC_RT5514_SPI_BUILTIN) += snd-soc-rt5514-spi.o
obj-$(CONFIG_SND_SOC_RT5616) += snd-soc-rt5616.o
obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o
OpenPOWER on IntegriCloud