From patchwork Fri Apr 10 22:18:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6200051 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 73A12BF4A6 for ; Fri, 10 Apr 2015 22:19:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AFF94201F2 for ; Fri, 10 Apr 2015 22:19:10 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id C9CC7201BC for ; Fri, 10 Apr 2015 22:19:09 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8CBE9260718; Sat, 11 Apr 2015 00:19:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id BCAF826068A; Sat, 11 Apr 2015 00:18:57 +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 C359626069E; Sat, 11 Apr 2015 00:18:54 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by alsa0.perex.cz (Postfix) with ESMTP id 50A05260688 for ; Sat, 11 Apr 2015 00:18:47 +0200 (CEST) Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0LxOBe-1ZRYfC1qXq-016ujZ; Sat, 11 Apr 2015 00:18:40 +0200 From: Arnd Bergmann To: broonie@kernel.org Date: Sat, 11 Apr 2015 00:18:37 +0200 Message-ID: <6164726.dCMByIoYOc@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:c1q6i3SjxtXmtcRHli63VaGCyQrN+wPWm+mWo0i0B13D2rkwkdk YjuzefqInBvNuBPHSrPwjwA7xd/OyLpU7VqsZcAcQqDUKAjjN8PU4AAx99DRZ0Mr5aaiSgD CPmzNaUCzBc8oQVEUXhbV7Z+LDeOclQ1UdJMQ+MA5R386dcrAee2gpMn4kERTrZmTZwdEUA p2P4kQ20oR9YiaZBr5Qag== X-UI-Out-Filterresults: notjunk:1; Cc: linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, Kuninori Morimoto , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] ASoC: rnsd: fix build regression without CONFIG_OF 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The r-car sound driver only works when CONFIG_OF is set, and after a recent change has a compile-time dependency as well: sound/built-in.o: In function `rsnd_dma_request_channel': :(.text+0x9fb84): undefined reference to `of_dma_request_slave_channel' This could be fixed either by adding a static inline wrapper for the function, or by adding a Kconfig dependency. This implements the second approach, which seems appropriate because the driver in fact has a hard dependency. Signed-off-by: Arnd Bergmann Fixes: 72adc61f4637aa3 ("ASoC: rsnd: 1st DMAC dma-names cares subnode") diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 2b3030415573..07114b0b0dc1 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -36,6 +36,7 @@ config SND_SOC_SH4_SIU config SND_SOC_RCAR tristate "R-Car series SRU/SCU/SSIU/SSI support" + depends on DMA_OF select SND_SIMPLE_CARD select REGMAP_MMIO help