Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753809AbbEZNMx (ORCPT ); Tue, 26 May 2015 09:12:53 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:3986 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753652AbbEZNLI (ORCPT ); Tue, 26 May 2015 09:11:08 -0400 Message-ID: <5564476E.5000505@atmel.com> Date: Tue, 26 May 2015 12:14:06 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Alexandre Belloni , Mark Brown CC: Arnd Bergmann , , , Subject: Re: [PATCH 2/2] ASoC: atmel: compile pcm driver in snd-soc-atmel_ssc_dai References: <1432591459-22613-1-git-send-email-alexandre.belloni@free-electrons.com> <1432591459-22613-2-git-send-email-alexandre.belloni@free-electrons.com> In-Reply-To: <1432591459-22613-2-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2453 Lines: 70 Le 26/05/2015 00:04, Alexandre Belloni a ?crit : > 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' > > Solve that by compiling the selected PCM driver (PDC, DMA or both) in the > Atmel SSC DAI driver. > > Reported-by: Randy Dunlap > > Signed-off-by: Alexandre Belloni For the record: Acked-by: Nicolas Ferre > --- > sound/soc/atmel/Kconfig | 4 ++-- > sound/soc/atmel/Makefile | 8 +++----- > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig > index 93abe4e6d596..c3152072d682 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 > - tristate > + bool > > 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 b327e5cc8de3..4fa7ac91f972 100644 > --- a/sound/soc/atmel/Makefile > +++ b/sound/soc/atmel/Makefile > @@ -1,10 +1,8 @@ > # AT91 Platform Support > -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 > +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) > > -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 > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/