From patchwork Mon Jun 20 16:01:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9187991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF652601C0 for ; Mon, 20 Jun 2016 15:59:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB9962766D for ; Mon, 20 Jun 2016 15:59:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADF682780C; Mon, 20 Jun 2016 15:59:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC3CF2766D for ; Mon, 20 Jun 2016 15:59:44 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8F08726664F; Mon, 20 Jun 2016 17:59:43 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 78F512665B3; Mon, 20 Jun 2016 17:59:41 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5F8322665CB; Mon, 20 Jun 2016 17:59:40 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by alsa0.perex.cz (Postfix) with ESMTP id 554E32665AC for ; Mon, 20 Jun 2016 17:59:33 +0200 (CEST) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0M0i6Q-1bWI2u1IAY-00upZF; Mon, 20 Jun 2016 17:59:30 +0200 From: Arnd Bergmann To: Mark Brown 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= Cc: Jose Abreu , alsa-devel@alsa-project.org, Liam Girdwood , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] ASoC: dwc: make pcm support built-in when necessary X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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