* [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai"
@ 2015-06-11 9:06 Alexandre Belloni
2015-06-11 9:06 ` [PATCH 2/2] ASoC: atmel: properly select dma driver state Alexandre Belloni
2015-06-12 10:34 ` [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai" Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Alexandre Belloni @ 2015-06-11 9:06 UTC (permalink / raw)
To: Nicolas Ferre, Mark Brown
Cc: alsa-devel, linux-arm-kernel, linux-kernel, Alexandre Belloni
After discussing with the Kconfig maintainer, we found a better fiw
allowing to keep each driver as modules.
This reverts commit 0ef9dc139db2fca304ce4eadb5b8fb40d3dedb5e.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
sound/soc/atmel/Kconfig | 4 ++--
sound/soc/atmel/Makefile | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index c3152072d682..93abe4e6d596 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -9,10 +9,10 @@ config SND_ATMEL_SOC
if SND_ATMEL_SOC
config SND_ATMEL_SOC_PDC
- bool
+ tristate
config SND_ATMEL_SOC_DMA
- bool
+ tristate
select SND_SOC_GENERIC_DMAENGINE_PCM
config SND_ATMEL_SOC_SSC
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile
index 4fa7ac91f972..b327e5cc8de3 100644
--- a/sound/soc/atmel/Makefile
+++ b/sound/soc/atmel/Makefile
@@ -1,8 +1,10 @@
# AT91 Platform Support
-snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_PDC) := atmel-pcm-pdc.o
-snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_DMA) += atmel-pcm-dma.o
-snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o $(snd-soc-atmel-pcm-y)
+snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o
+snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o
+snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.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
obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o
# AT91 Machine Support
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ASoC: atmel: properly select dma driver state
2015-06-11 9:06 [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai" Alexandre Belloni
@ 2015-06-11 9:06 ` Alexandre Belloni
2015-06-12 10:34 ` [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai" Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Belloni @ 2015-06-11 9:06 UTC (permalink / raw)
To: Nicolas Ferre, Mark Brown
Cc: alsa-devel, linux-arm-kernel, linux-kernel, Alexandre Belloni
It is currently possible to have CONFIG_SND_ATMEL_SOC_SSC=y with either
CONFIG_SND_ATMEL_SOC_PDC=m or CONFIG_SND_ATMEL_SOC_DMA=m. This results in a
driver that compiles but does not link with this kind of error:
sound/built-in.o: In function `atmel_ssc_set_audio':
(.text+0x87d90): undefined reference to `atmel_pcm_pdc_platform_register'
sound/built-in.o: In function `atmel_ssc_put_audio':
(.text+0x8879a): undefined reference to `atmel_pcm_pdc_platform_unregister'
Introduce new config options SND_ATMEL_SOC_SSC_PDC and
SND_ATMEL_SOC_SSC_DMA which should be used by the board drivers and the
correct logic to properly select the SND_ATMEL_SOC_PDC and
SND_ATMEL_SOC_DMA states.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
sound/soc/atmel/Kconfig | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index 93abe4e6d596..1489cd461aec 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -10,20 +10,31 @@ if SND_ATMEL_SOC
config SND_ATMEL_SOC_PDC
tristate
+ 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_AT91_SOC_SAM9G20_WM8731
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
depends on ARCH_AT91 || COMPILE_TEST
depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
- select SND_ATMEL_SOC_PDC
- select SND_ATMEL_SOC_SSC
+ select SND_ATMEL_SOC_SSC_PDC
select SND_SOC_WM8731
help
Say Y if you want to add support for SoC audio on WM8731-based
@@ -33,8 +44,7 @@ config SND_ATMEL_SOC_WM8904
tristate "Atmel ASoC driver for boards using WM8904 codec"
depends on ARCH_AT91 || COMPILE_TEST
depends on ATMEL_SSC && I2C
- select SND_ATMEL_SOC_SSC
- select SND_ATMEL_SOC_DMA
+ select SND_ATMEL_SOC_SSC_DMA
select SND_SOC_WM8904
help
Say Y if you want to add support for Atmel ASoC driver for boards using
@@ -44,8 +54,7 @@ config SND_AT91_SOC_SAM9X5_WM8731
tristate "SoC Audio support for WM8731-based at91sam9x5 board"
depends on ARCH_AT91 || COMPILE_TEST
depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
- select SND_ATMEL_SOC_SSC
- select SND_ATMEL_SOC_DMA
+ select SND_ATMEL_SOC_SSC_DMA
select SND_SOC_WM8731
help
Say Y if you want to add support for audio SoC on an
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai"
2015-06-11 9:06 [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai" Alexandre Belloni
2015-06-11 9:06 ` [PATCH 2/2] ASoC: atmel: properly select dma driver state Alexandre Belloni
@ 2015-06-12 10:34 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2015-06-12 10:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Nicolas Ferre, alsa-devel, linux-arm-kernel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
On Thu, Jun 11, 2015 at 11:06:08AM +0200, Alexandre Belloni wrote:
> After discussing with the Kconfig maintainer, we found a better fiw
> allowing to keep each driver as modules.
Applied, but please use subject lines matching the style for the
subsystem.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-12 10:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-11 9:06 [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai" Alexandre Belloni
2015-06-11 9:06 ` [PATCH 2/2] ASoC: atmel: properly select dma driver state Alexandre Belloni
2015-06-12 10:34 ` [PATCH 1/2] Revert "ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai" Mark Brown
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).