From patchwork Sat Apr 26 07:21:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Kaixu X-Patchwork-Id: 29144 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E7FD20534 for ; Sat, 26 Apr 2014 07:23:05 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id x10sf2353065pdj.11 for ; Sat, 26 Apr 2014 00:23:04 -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=Q+MQgHDVamxaobmbZorAzi6+aKZBKS8cau+0FzUiBYM=; b=YA68MZJz6omLQw5JNqpmqXkqzgoInX27UIHuak5hdt6IPtG/VgrHZO+3+yDQu6nX3K P0tMCY0gtPNTKYc+5NQogEG8ylGx24ZDOIJHYXQg+jHE4lu91zdGCLVwnEUQ6jD+c8Nn YVGPOkY+/DrNrj38v8Zz57vfL1CXmckeQYKDjUGc/ib8DFaL29gjRYQ49nY7URvKV0Bl tiaaU6k9pAqOrkR8WlrSKsHJLs//np3GyyhV8xqONnrlvvXDm6RxmkX4LzVhx2I4r6f4 BWDQdkSrKg/XXOmDxN9uOL8ZeNyYz0Xzz0s4SgAybLGPUcVMwhRHyLyaMpXjQFsdxC3A M9Mg== X-Gm-Message-State: ALoCoQnXCaqcDNKVZQzciiP9GEU3xMh2kkgadLnM5XPszxzJzAa8fBPtFki8LH90g3YCASxbNc1z X-Received: by 10.67.4.202 with SMTP id cg10mr5428682pad.42.1398496984618; Sat, 26 Apr 2014 00:23:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.10 with SMTP id l10ls1784976qga.4.gmail; Sat, 26 Apr 2014 00:23:04 -0700 (PDT) X-Received: by 10.52.191.100 with SMTP id gx4mr9235310vdc.4.1398496984483; Sat, 26 Apr 2014 00:23:04 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id k20si2283867vcm.205.2014.04.26.00.23.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:23:04 -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.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so5761538veb.37 for ; Sat, 26 Apr 2014 00:23:04 -0700 (PDT) X-Received: by 10.58.126.4 with SMTP id mu4mr11133747veb.0.1398496984421; Sat, 26 Apr 2014 00:23:04 -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 ib8csp152780vcb; Sat, 26 Apr 2014 00:23:04 -0700 (PDT) X-Received: by 10.66.171.206 with SMTP id aw14mr12854268pac.48.1398496983620; Sat, 26 Apr 2014 00:23:03 -0700 (PDT) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by mx.google.com with ESMTPS id ov9si6334016pbc.471.2014.04.26.00.23.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:23:03 -0700 (PDT) Received-SPF: none (google.com: kaixu.xia@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.54; Received: by mail-pa0-f54.google.com with SMTP id lf10so3968021pab.13 for ; Sat, 26 Apr 2014 00:23:03 -0700 (PDT) X-Received: by 10.66.197.135 with SMTP id iu7mr12681012pac.149.1398496983243; Sat, 26 Apr 2014 00:23:03 -0700 (PDT) Received: from localhost.localdomain ([218.17.215.175]) by mx.google.com with ESMTPSA id bc4sm20640376pbb.2.2014.04.26.00.22.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 00:23:02 -0700 (PDT) From: Xia Kaixu To: linaro-kernel@lists.linaro.org, arnd@arndb.de Cc: kaixu.xia@linaro.org, patches@linaro.org Subject: [PATCH 14/15] ASoC: samsung: don't build pcm and spdif on exynos Date: Sat, 26 Apr 2014 15:21:48 +0800 Message-Id: <1398496909-27785-15-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 In commit d37bdf736d9b "ASoC: samsung: Use ASoC dmaengine code where possible", Mark Brown changed the EXYNOS ASoC code to no longer use the private dma interfaces that are standing in the way of multiplatform enablement. However, in 313367e7bfa "ASoC: Samsung: Update Kconfig for I2S,SPDIF and PCM audio", two new users of that interface appeared, since it is now possible to enable SND_SOC_SAMSUNG_SMDK_SPDIF and SND_SOC_SMDK_WM8994_PCM on all Samsung SoCs including EXYNOS. This patch does a partial revert of 313367e7bfa by allowing these drivers on all samsung platforms except EXYNOS, so we can proceed with the multiplatform patches. If support for these drivers is actually needed on EXYNOS machines, the drivers should first be moved over to use the dmaengine code. Signed-off-by: Arnd Bergmann Signed-off-by: Xia Kaixu Cc: Ben Dooks Cc: Sangbeom Kim Cc: Kukjin Kim Cc: Padmavathi Venna Cc: Mark Brown Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: alsa-devel@alsa-project.org --- sound/soc/samsung/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 7b610a8..efc01e0 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -167,7 +167,7 @@ config SND_SOC_GONI_AQUILA_WM8994 config SND_SOC_SAMSUNG_SMDK_SPDIF tristate "SoC S/PDIF Audio support for SMDK" - depends on SND_SOC_SAMSUNG + depends on SND_SOC_SAMSUNG && !ARCH_EXYNOS select SND_SAMSUNG_SPDIF help Say Y if you want to add support for SoC S/PDIF audio on the SMDK. @@ -183,7 +183,7 @@ config SND_SOC_SMDK_WM8580_PCM config SND_SOC_SMDK_WM8994_PCM tristate "SoC PCM Audio support for WM8994 on SMDK" - depends on SND_SOC_SAMSUNG + depends on SND_SOC_SAMSUNG && !ARCH_EXYNOS depends on I2C=y select MFD_WM8994 select SND_SOC_WM8994