From patchwork Sat Apr 26 07:21:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 29142 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1771920534 for ; Sat, 26 Apr 2014 07:22:54 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf27472793iec.10 for ; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=fni/yxJw5MjS4u85imwdEUn1JSY90bHBNmHIK3oF0Jg=; b=fY4NG8X0I3zlCDMUx3Q5uu30tLaJNb43HRkekl8zENgv/aDa8+MWQlseDNo0pRnm38 HcWdYiBBVDzGBHoNUKS8xi9JROGsVlJE9HfId9SjLtDK17MabGCjfKov3bb2P/pWmRSp 1g1RcfwcUe1kOaWqTmwaZl3YVckwhbj1AdXdirTNWHRRK0hKm2zJVSE5Khg9qCFo9FkJ jxuscBQIStY5IZiPMZ+rMTOjepog2yJLFLH4/nft2BUT0lEfRAE+VqPd1zyxu7jCmVA1 DNKE8HU9AntkcUHSMMgFftLH9MR5aUbvFWV86hFxxjN4jaJyogmxII5TWuJ0MGzjBKdz bDsg== X-Gm-Message-State: ALoCoQnHtmvQbU2CwL7yRlZv0Q1OazjBuqAQhAlw5rSeJseiw3tVw6tEpaxg7VaTRoYKmB5QwzvF X-Received: by 10.182.22.133 with SMTP id d5mr7046201obf.27.1398496974558; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.145 with SMTP id 17ls371695qgn.21.gmail; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) X-Received: by 10.52.191.100 with SMTP id gx4mr9234718vdc.4.1398496974480; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id s7si2290173vev.110.2014.04.26.00.22.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:22:54 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id la4so5888921vcb.17 for ; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) X-Received: by 10.52.116.101 with SMTP id jv5mr9353445vdb.11.1398496974405; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp152769vcb; Sat, 26 Apr 2014 00:22:54 -0700 (PDT) X-Received: by 10.68.134.169 with SMTP id pl9mr12650595pbb.133.1398496973713; Sat, 26 Apr 2014 00:22:53 -0700 (PDT) Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by mx.google.com with ESMTPS id ot5si234709pbc.467.2014.04.26.00.22.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:22:53 -0700 (PDT) Received-SPF: none (google.com: kaixu.xia@linaro.org does not designate permitted sender hosts) client-ip=209.85.192.172; Received: by mail-pd0-f172.google.com with SMTP id w10so3908294pde.17 for ; Sat, 26 Apr 2014 00:22:53 -0700 (PDT) X-Received: by 10.67.4.138 with SMTP id ce10mr12764885pad.12.1398496973338; Sat, 26 Apr 2014 00:22:53 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id bc4sm20640376pbb.2.2014.04.26.00.22.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:22:52 -0700 (PDT) From: Xia Kaixu To: linaro-kernel@lists.linaro.org, arnd@arndb.de Cc: kaixu.xia@linaro.org, patches@linaro.org Subject: [PATCH 12/15] ASoC: SND_S3C_DMA_LEGACY needs S3C24XX_DMA Date: Sat, 26 Apr 2014 15:21:46 +0800 Message-Id: <1398496909-27785-13-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398496909-27785-1-git-send-email-kaixu.xia@linaro.org> References: <1398496909-27785-1-git-send-email-kaixu.xia@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: kaixu.xia@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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