On Tue, Jul 23, 2019 at 08:39:15PM +0200, Alexandre Belloni wrote: > On 23/07/2019 18:43:12+0200, mirq-linux@xxxxxxxxxxxx wrote: > > On Tue, Jul 23, 2019 at 01:36:37PM +0000, Codrin.Ciubotariu@xxxxxxxxxxxxx wrote: > > > On 22.07.2019 21:27, Michał Mirosław wrote: > > > > Allow SSC to be used on platforms described using audio-graph-card > > > > in Device Tree. > > > > > > > > Signed-off-by: Michał Mirosław <mirq-linux@xxxxxxxxxxxx> > > > > --- > > > > sound/soc/atmel/Kconfig | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig > > > > index 06c1d5ce642c..9ef9d25bb517 100644 > > > > --- a/sound/soc/atmel/Kconfig > > > > +++ b/sound/soc/atmel/Kconfig > > > > @@ -25,7 +25,7 @@ config SND_ATMEL_SOC_DMA > > > > default y if SND_ATMEL_SOC_SSC_DMA=y || (SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=y) > > > > > > > > config SND_ATMEL_SOC_SSC_DMA > > > > - tristate > > > > + tristate "SoC PCM DAI support for AT91 SSC controller using DMA" > > > > > > Could you please make something similar for SND_ATMEL_SOC_SSC_PDC? Also, > > > I think that it should select ATMEL_SSC, to be able to use > > > simple/graph-card with SSC. > > > > Hmm. The Kconfig dependencies seems overly complicated, do you mind if I > > get rid of most of the entries in the process? > > > > Unfortunately, it is just complicated enough. This is done to support > all the possible configurations. Removing them will lead to linking > errors. > > After having that discussion back in March, I had a very quick look and > didn't send a patch because I still had linking issues. It is not > impossible but it required more time than I had. Can you try patch below if it covers the configurations you mention? This uses Kconfig's m/y resolution instead of open-coded defaults. Best Regards, Michał Mirosław diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 06c1d5ce642c..f118c229ed82 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -12,25 +12,31 @@ if SND_ATMEL_SOC config SND_ATMEL_SOC_PDC tristate depends on HAS_DMA - default m if SND_ATMEL_SOC_SSC_PDC=m && SND_ATMEL_SOC_SSC=m - default y if SND_ATMEL_SOC_SSC_PDC=y || (SND_ATMEL_SOC_SSC_PDC=m && SND_ATMEL_SOC_SSC=y) - -config SND_ATMEL_SOC_SSC_PDC - tristate 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 - default y if SND_ATMEL_SOC_SSC_DMA=y || (SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=y) - -config SND_ATMEL_SOC_SSC_DMA - tristate config SND_ATMEL_SOC_SSC tristate - default y if SND_ATMEL_SOC_SSC_DMA=y || SND_ATMEL_SOC_SSC_PDC=y - default m if SND_ATMEL_SOC_SSC_DMA=m || SND_ATMEL_SOC_SSC_PDC=m + +config SND_ATMEL_SOC_SSC_PDC + tristate "SoC PCM DAI support for AT91 SSC controller using PDC" + depends on ATMEL_SSC + select SND_ATMEL_SOC_PDC + select SND_ATMEL_SOC_SSC + help + Say Y or M if you want to add support for Atmel SSC interface + in PDC mode configured using audio-graph-card in device-tree. + +config SND_ATMEL_SOC_SSC_DMA + tristate "SoC PCM DAI support for AT91 SSC controller using DMA" + depends on ATMEL_SSC + select SND_ATMEL_SOC_DMA + select SND_ATMEL_SOC_SSC + help + Say Y or M if you want to add support for Atmel SSC interface + in DMA mode configured using audio-graph-card in device-tree. config SND_AT91_SOC_SAM9G20_WM8731 tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" -- 2.20.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
