From patchwork Tue Apr 29 09:23:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 29330 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E81F7202DD for ; Tue, 29 Apr 2014 09:24:55 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id eb12sf46676886oac.3 for ; Tue, 29 Apr 2014 02:24:55 -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=SIHQDZBTEKSWsVEJdNIBVhx3Rca9m5l1Q4XBYNYuXvTdcCtglGZqvoKPrgkNlcpbne QOrUDIGxn+/dDTrjMB4OVmbkTXxQK6iplpXEXgut2khdCZYY57/nvlHLEtvdsmdsX4Pf yh/wHCwVBtjKaBZmHpTPzCRJr0+HEhZc44KDPj59zRy/csRQsqGEY5wILup/9KnTOyrg wdo3lxbp4yXswk7xtUHbV8R2QDo+zdP2XqSPcVyb6IrFNm0l+aa9b6qYdKLRr+qbw8PY e/FQHIVTex4ezrrtT4K2WdiIm6jWrGO20+BPIExo/NhIsNELFkWTyM8JJxX5Hn4JZG5e mETA== X-Gm-Message-State: ALoCoQl1m17Isng8PeESHT/ekiaJ6UhHe2FltMQtis2U0W/OFpo7vN0BcWpkVAaPhs91Mr7kJB9S X-Received: by 10.43.161.202 with SMTP id mh10mr12711003icc.23.1398763495319; Tue, 29 Apr 2014 02:24:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.146 with SMTP id 18ls23852qgr.58.gmail; Tue, 29 Apr 2014 02:24:55 -0700 (PDT) X-Received: by 10.58.1.5 with SMTP id 5mr29091868vei.8.1398763495134; Tue, 29 Apr 2014 02:24:55 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id tz5si4357279vdc.7.2014.04.29.02.24.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 02:24:55 -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.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so9394231veb.4 for ; Tue, 29 Apr 2014 02:24:55 -0700 (PDT) X-Received: by 10.52.6.162 with SMTP id c2mr24485410vda.6.1398763495037; Tue, 29 Apr 2014 02:24:55 -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 ib8csp181863vcb; Tue, 29 Apr 2014 02:24:54 -0700 (PDT) X-Received: by 10.67.23.135 with SMTP id ia7mr31510428pad.5.1398763493768; Tue, 29 Apr 2014 02:24:53 -0700 (PDT) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by mx.google.com with ESMTPS id nf8si10343038pbc.52.2014.04.29.02.24.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 02:24:53 -0700 (PDT) Received-SPF: none (google.com: kaixu.xia@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.43; Received: by mail-pa0-f43.google.com with SMTP id rd3so4997156pab.2 for ; Tue, 29 Apr 2014 02:24:53 -0700 (PDT) X-Received: by 10.68.245.162 with SMTP id xp2mr31386137pbc.69.1398763493415; Tue, 29 Apr 2014 02:24:53 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id ek2sm40447807pbd.30.2014.04.29.02.24.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 02:24: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 v2 13/15] ASoC: SND_S3C_DMA_LEGACY needs S3C24XX_DMA Date: Tue, 29 Apr 2014 17:23:30 +0800 Message-Id: <1398763412-18928-14-git-send-email-kaixu.xia@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398763412-18928-1-git-send-email-kaixu.xia@linaro.org> References: <1398763412-18928-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