lkml.org 
[lkml]   [2020]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4.19 114/191] ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m
Hi!

> [ Upstream commit 8fea78029f5e6ed734ae1957bef23cfda1af4354 ]
>
> If CONFIG_SND_ATMEL_SOC_DMA=m, build error:
>
> sound/soc/atmel/atmel_ssc_dai.o: In function `atmel_ssc_set_audio':
> (.text+0x7cd): undefined reference to `atmel_pcm_dma_platform_register'
>
> Function atmel_pcm_dma_platform_register is defined under
> CONFIG SND_ATMEL_SOC_DMA, so select SND_ATMEL_SOC_DMA in
> CONFIG SND_ATMEL_SOC_SSC, same to CONFIG_SND_ATMEL_SOC_PDC.

4.19 code has significant differences from mainline in this area.

4.19:
config SND_ATMEL_SOC_DMA
tristate
select SND_SOC_GENERIC_DMAENGINE_PCM
default m if SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=m
...

mainline:
config SND_ATMEL_SOC_DMA
tristate
select SND_SOC_GENERIC_DMAENGINE_PCM
...

Extra 'default m if' line in 4.19 should already prevent this bug,
additional select statements are not neccessary.

Best regards,
Pavel

> +++ b/sound/soc/atmel/Kconfig
> @@ -25,6 +25,8 @@ config SND_ATMEL_SOC_DMA
>
> config SND_ATMEL_SOC_SSC_DMA
> tristate
> + select SND_ATMEL_SOC_DMA
> + select SND_ATMEL_SOC_PDC
>
> config SND_ATMEL_SOC_SSC
> tristate

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-02-21 23:28    [W:0.840 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site