From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: alsa-devel@alsa-project.org,
"Liam Girdwood" <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org, "Takashi Iwai" <tiwai@suse.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Ludovic Desroches" <ludovic.desroches@microchip.com>,
"Mark Brown" <broonie@kernel.org>,
"Codrin Ciubotariu" <codrin.ciubotariu@microchip.com>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ASoC: atmel: fix atmel_ssc_set_audio link failure
Date: Tue, 1 Oct 2019 16:27:34 +0200 [thread overview]
Message-ID: <20191001142734.GD4106@piout.net> (raw)
In-Reply-To: <20191001142116.1172290-1-arnd@arndb.de>
Hi,
On 01/10/2019 16:20:55+0200, Arnd Bergmann wrote:
> The ssc audio driver can call into both pdc and dma backends. With the
> latest rework, the logic to do this in a safe way avoiding link errors
> was removed, bringing back link errors that were fixed long ago in commit
> 061981ff8cc8 ("ASoC: atmel: properly select dma driver state") such as
>
> sound/soc/atmel/atmel_ssc_dai.o: In function `atmel_ssc_set_audio':
> atmel_ssc_dai.c:(.text+0xac): undefined reference to `atmel_pcm_pdc_platform_register'
>
> Fix it this time using Makefile hacks and a comment to prevent this
> from accidentally getting removed again rather than Kconfig hacks.
>
> Fixes: 18291410557f ("ASoC: atmel: enable SOC_SSC_PDC and SOC_SSC_DMA in Kconfig")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> sound/soc/atmel/Kconfig | 4 ++--
> sound/soc/atmel/Makefile | 10 ++++++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
> index f118c229ed82..25c31bf64936 100644
> --- a/sound/soc/atmel/Kconfig
> +++ b/sound/soc/atmel/Kconfig
> @@ -10,11 +10,11 @@ config SND_ATMEL_SOC
> if SND_ATMEL_SOC
>
> config SND_ATMEL_SOC_PDC
> - tristate
> + bool
> depends on HAS_DMA
>
> config SND_ATMEL_SOC_DMA
> - tristate
> + bool
> select SND_SOC_GENERIC_DMAENGINE_PCM
>
> config SND_ATMEL_SOC_SSC
> diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile
> index 1f6890ed3738..c7d2989791be 100644
> --- a/sound/soc/atmel/Makefile
> +++ b/sound/soc/atmel/Makefile
> @@ -6,8 +6,14 @@ snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o
> snd-soc-atmel-i2s-objs := atmel-i2s.o
> snd-soc-mchp-i2s-mcc-objs := mchp-i2s-mcc.o
>
> -obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o
> -obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o
> +# pdc and dma need to both be built-in if any user of
> +# ssc is built-in.
> +ifdef CONFIG_SND_ATMEL_SOC_PDC
> +obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel-pcm-pdc.o
> +endif
> +ifdef CONFIG_SND_ATMEL_SOC_DMA
> +obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel-pcm-dma.o
> +endif
Doesn't that prevent them to be built as a module at all?
I'm not sure there is a use case though.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-01 14:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 14:20 [PATCH] ASoC: atmel: fix atmel_ssc_set_audio link failure Arnd Bergmann
2019-10-01 14:27 ` Alexandre Belloni [this message]
2019-10-01 15:59 ` Arnd Bergmann
2019-10-01 14:56 ` Michał Mirosław
2019-10-01 17:55 ` Mark Brown
2019-10-01 19:02 ` Arnd Bergmann
2019-10-02 11:33 ` 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=20191001142734.GD4106@piout.net \
--to=alexandre.belloni@bootlin.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=codrin.ciubotariu@microchip.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=mirq-linux@rere.qmqm.pl \
--cc=perex@perex.cz \
--cc=tiwai@suse.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).