From patchwork Tue Apr 29 11:18:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 4087971 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 08645BFF02 for ; Tue, 29 Apr 2014 14:38:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24DE2201F5 for ; Tue, 29 Apr 2014 14:38:48 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D07B9201F9 for ; Tue, 29 Apr 2014 14:38:46 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id DB4DB2655F3; Tue, 29 Apr 2014 16:38:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00, RCVD_IN_SORBS_WEB, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 36069265189; Tue, 29 Apr 2014 16:28:09 +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 177D1265098; Tue, 29 Apr 2014 13:20:42 +0200 (CEST) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by alsa0.perex.cz (Postfix) with ESMTP id 51306265086 for ; Tue, 29 Apr 2014 13:20:24 +0200 (CEST) Received: by mail-pd0-f182.google.com with SMTP id v10so44674pde.41 for ; Tue, 29 Apr 2014 04:20:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fni/yxJw5MjS4u85imwdEUn1JSY90bHBNmHIK3oF0Jg=; b=FVWrMGAZk5SKFUioueS68bv8wY27mWM5wEvUtmGQVJe5lrT1Fua0ONyqiAqHupKC6G zSnVzdP3DDvQH9JD0CotUJkVmSjiQIkVjVJfE8iW2exz2Crv4npOfVsQYV35Uwj3oZ+f bzIIDpJzMematXvKNd32bECkdHteOVTW2CsgDEOq3FE0nchETZZveqQeUqOtJyjJd5m9 oSL3INFLROdwJ4SXD1ZDe1oKrt6tqHG9OyHyijlTin+6vCIwMWTDKCI4bYXSjS5ju/m/ 8v6qfqsUh77x4ANUTqb1oShtcw5+BULZJ6u1JO+cf58F6sfCW/a+/CUO0kFFlrlU/c3a 3plA== X-Gm-Message-State: ALoCoQnTT+qjLiaaNjcsT9yrqm9mwN1eQrfk8e6Yeh7t5swtsP/uau2iT8/BxoEZMwvPFxMcR+s8 X-Received: by 10.66.150.228 with SMTP id ul4mr32471791pab.16.1398770422327; Tue, 29 Apr 2014 04:20:22 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id xo9sm108641006pab.18.2014.04.29.04.20.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 04:20:21 -0700 (PDT) From: Xia Kaixu To: linux-kernel@vger.kernel.org Date: Tue, 29 Apr 2014 19:18:34 +0800 Message-Id: <1398770316-19715-14-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398770316-19715-1-git-send-email-kaixu.xia@linaro.org> References: <1398770316-19715-1-git-send-email-kaixu.xia@linaro.org> X-Mailman-Approved-At: Tue, 29 Apr 2014 16:27:55 +0200 Cc: alsa-devel@alsa-project.org, linaro-kernel@lists.linaro.org, arnd@arndb.de, Sangbeom Kim , Liam Girdwood , linux-samsung-soc@vger.kernel.org, Mark Brown , Ben Dooks , Kukjin Kim , linux-arm-kernel@lists.infradead.org, kaixu.xia@linaro.org Subject: [alsa-devel] [PATCH 13/15] ASoC: SND_S3C_DMA_LEGACY needs S3C24XX_DMA 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 From: Arnd Bergmann SND_S3C_DMA_LEGACY can only be set on S3C24xx, which does not (yet) support the dmaengine framework, so samsung_dma_get_ops() fails to link if S3C24XX_DMA is disabled: sound/built-in.o: In function `dma_hw_params': :(.text+0x7f310): undefined reference to `s3c_dma_get_ops' sound/built-in.o: In function `s3c_ac97_trigger': :(.text+0x7f7f0): undefined reference to `s3c_dma_get_ops' sound/built-in.o: In function `s3c_ac97_mic_trigger': :(.text+0x7f884): undefined reference to `s3c_dma_get_ops' sound/built-in.o: In function `s3c2412_i2s_trigger': :(.text+0x80944): undefined reference to `s3c2410_dma_ctrl' This makes sure S3C24XX_DMA is always enabled when we need it, just like we do it for the same dependency in SND_S3C24XX_I2S, which has the same problem. Selecting "S3C2410_DMA" as we did before does not actually have the intended effect, since that one is only used on the s3c2410 and s3c2442 SoCs of the s3c24xx family, but not the others, so we can remove this from Kconfig. Signed-off-by: Arnd Bergmann Signed-off-by: Xia Kaixu Cc: Mark Brown Cc: Liam Girdwood Cc: Ben Dooks Cc: Kukjin Kim Cc: Sangbeom Kim Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: alsa-devel@alsa-project.org --- sound/soc/samsung/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 99cc196..7b610a8 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -1,7 +1,6 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on PLAT_SAMSUNG - select S3C2410_DMA if ARCH_S3C24XX select S3C64XX_PL080 if ARCH_S3C64XX select SND_S3C_DMA if !ARCH_S3C24XX select SND_S3C_DMA_LEGACY if ARCH_S3C24XX @@ -15,11 +14,11 @@ config SND_S3C_DMA tristate config SND_S3C_DMA_LEGACY + select S3C24XX_DMA tristate config SND_S3C24XX_I2S tristate - select S3C24XX_DMA config SND_S3C_I2SV2_SOC tristate @@ -27,7 +26,6 @@ config SND_S3C_I2SV2_SOC config SND_S3C2412_SOC_I2S tristate select SND_S3C_I2SV2_SOC - select S3C2410_DMA config SND_SAMSUNG_PCM tristate @@ -83,7 +81,6 @@ config SND_SOC_SAMSUNG_SMDK_WM8994 config SND_SOC_SAMSUNG_SMDK2443_WM9710 tristate "SoC AC97 Audio support for SMDK2443 - WM9710" depends on SND_SOC_SAMSUNG && MACH_SMDK2443 - select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC select SND_SAMSUNG_AC97 @@ -94,7 +91,6 @@ config SND_SOC_SAMSUNG_SMDK2443_WM9710 config SND_SOC_SAMSUNG_LN2440SBC_ALC650 tristate "SoC AC97 Audio support for LN2440SBC - ALC650" depends on SND_SOC_SAMSUNG && ARCH_S3C24XX - select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_CODEC select SND_SAMSUNG_AC97