From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753689AbcFTQBP (ORCPT ); Mon, 20 Jun 2016 12:01:15 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:49317 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753650AbcFTP7y (ORCPT ); Mon, 20 Jun 2016 11:59:54 -0400 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Jose Abreu , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: dwc: make pcm support built-in when necessary Date: Mon, 20 Jun 2016 18:01:19 +0200 Message-Id: <20160620160131.2565092-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:/wEkSAjbrks0kEKtM//urA2vfR+1Mdmpb6b+rPv56dddGOCD/+W VPSTW8oUb+6WAn+rFIqmsxEhndRrQreY1TprT4BdLR66Dl++WHP8CC+O43GhY/RgDga+OZz 2lwlvAvINzvQswKhr8MBy0k+cj7FNDMfb+QolTohDq19fiIxy4Oe6Sn5br94vz0Up7iVLgi MQCRF/GKqsyVxEkrheg9w== X-UI-Out-Filterresults: notjunk:1;V01:K0:sZYEDqsKuN0=:5s9GdBC2+R2PXvmYyUAWp6 ilsPbPAu33nuuDocqmt36sMvA2FZ4MA38MJu5QH2RROEKIQPGlqB5qTqKqFie5fwQF9GAYYdO Y8dTwZ26JJ5efPeWY7YS9JIvSko7Fzi3bFyJNXnsndRYTqcJGhaTeapGUyp0iOUApgd6D4ywT ECiJImOwLvmSdphID2djqUoF8INX5hwKbt1/NZmwNpJeMe7TbiTMgSdz8o5yE4V/f08wHM5PY tcCFKDXXCC+nyH8IHGoRtdaaEnIbXqBLFNtXBvkdtkiACFhz+O+5Xr5qDUiIhoemYm7YJiV32 gtNFIMyHuqphm8AMCX1lVXanTH6oN0+Kkm8mlvq19rG2XTrICFuwzvTVKUNRD8Ygo4YgHfvsK Hg39dYSQC1JmqzndSK0XNKMuSm5cQ0lGELSq3hKK6Rmag5GwCRzkTPTiF3tlnF9K3TIAKoaV8 8j5mapB89Fj6MorwfGMppet/NAL3i3qop+2Bc2rNYQOeaY74KpPtkU54nevUkHMrd/MWhZhp2 BPurMQEPLa8G4F/SVexB78JCTcDaQKSg9nuZRZwWdDivW2t8hO03mofNPBWdRq575vA85/sc5 +0XWRCezK1G2bdw3amQPKDtCC7PbHOAhh8TPctoIQqK/bWVyLW4WjJMoXX3yGTW7nyaGPgW+P LxsB4DrA0RB6JWtA6GVYrd3TCGq+Zv3tOylWu2/u8VT3gujSEmpJhUsJNDrsNOKxbHTI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new PIO mode for the dwc audio driver causes a link failure when it is built as a loadable module but the audio driver is built-in: sound/built-in.o: In function `i2s_irq_handler': :(.text+0x58c64): undefined reference to `dw_pcm_push_tx' sound/built-in.o: In function `dw_i2s_probe': :(.text+0x593dc): undefined reference to `dw_pcm_register' We could link both into a single module, but apparently the author intended them to be separate, so this instead changes the Makefile to force the pcm module to be built-in if the base module is. This is a bit hacky but not as bad as trying to work around it in Kconfig language. Signed-off-by: Arnd Bergmann Fixes: 79361b2b98b7 ("ASoC: dwc: Add PIO PCM extension") --- sound/soc/dwc/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/dwc/Makefile b/sound/soc/dwc/Makefile index 1b48bcccbc51..38f1ca31c5fa 100644 --- a/sound/soc/dwc/Makefile +++ b/sound/soc/dwc/Makefile @@ -1,4 +1,5 @@ # SYNOPSYS Platform Support obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_i2s.o -obj-$(CONFIG_SND_DESIGNWARE_PCM) += designware_pcm.o - +ifdef CONFIG_SND_DESIGNWARE_PCM +obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_pcm.o +endif -- 2.9.0