From patchwork Tue Mar 18 16:18:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3848581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E8B339F334 for ; Tue, 18 Mar 2014 16:18:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F3F32039D for ; Tue, 18 Mar 2014 16:18:51 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3A29203A9 for ; Tue, 18 Mar 2014 16:18:49 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPwiz-0003I6-EE; Tue, 18 Mar 2014 16:18:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPwiw-0007mf-RN; Tue, 18 Mar 2014 16:18:42 +0000 Received: from moutng.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WPwit-0007lr-3b for linux-arm-kernel@lists.infradead.org; Tue, 18 Mar 2014 16:18:40 +0000 Received: from klappe2.localnet (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue001) with ESMTP (Nemesis) id 0MPMZc-1WUKR80Y6K-004OxS; Tue, 18 Mar 2014 17:18:10 +0100 From: Arnd Bergmann To: Padmavathi Venna Subject: [RFC] ASoC: samsung: don't build pcm and spdif on exynos Date: Tue, 18 Mar 2014 17:18:02 +0100 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201403181718.02780.arnd@arndb.de> X-Provags-ID: V02:K0:pp8Ge1kCdS6hoJON79BwFrXfpB6DK1F2dd0Mve1LyTf i+ZWoKcceKcWowvYeu+9om4sG1HfvuXynKhnYhb6pIZMdodmRL NPTgTMegXqiBJfY5bBgvBsUq3rp6i2oA0uZlGWV457TGTxO99U +YkqgUC8+s8P71fdxBkpEdeAs8pAm7Xhe46OfvMWWExDTISSgA zrX3EBS/1B2v5udwSPb4NfwCcQt9Y3qMcKWYbOWhZFm7IAWBBv H7fXRVE/hL+NxLF8obxO2M6EjxCK9blDMtAijTSnCiJAs3bwCt 9WZCZxy/tTOAoCw4wbTG5gq4ElMSBIheBi1nlXdbCy8opxT1Nf fmpgd4l/9uutfhB9wZqydKb+9QgqRcwuJsHHHTgGv X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140318_121839_415137_BB0E01E7 X-CRM114-Status: GOOD ( 12.27 ) X-Spam-Score: -1.9 (-) Cc: Sangbeom Kim , Sangsu Park , Mark Brown , alsa-devel@alsa-project.org, "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 probably first be moved over to use the dmaengine code. Signed-off-by: Arnd Bergmann Cc: Sangsu Park Cc: Sangbeom Kim Cc: Padmavathi Venna Cc: Mark Brown --- Padma, could you comment on this? When you did the patch that introduced the usage of these drivers on EXYNOS, did you actually need that for a particular machine that would get broken by this revert? 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