From patchwork Mon Apr 28 14:46:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4078681 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 75174BFF02 for ; Mon, 28 Apr 2014 14:46:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BBE3520304 for ; Mon, 28 Apr 2014 14:46:57 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 9E9FB201B4 for ; Mon, 28 Apr 2014 14:46:56 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 96D69261A48; Mon, 28 Apr 2014 16:46:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 7AA2F2616EF; Mon, 28 Apr 2014 16:46:44 +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 151622617AD; Mon, 28 Apr 2014 16:46:43 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) by alsa0.perex.cz (Postfix) with ESMTP id 1185E261600 for ; Mon, 28 Apr 2014 16:46:35 +0200 (CEST) Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue004) with ESMTP (Nemesis) id 0MdqQ5-1WFhpi0FH3-00PaTN; Mon, 28 Apr 2014 16:46:31 +0200 From: Arnd Bergmann To: Mark Brown Date: Mon, 28 Apr 2014 16:46:30 +0200 Message-ID: <6606961.lAGLvkNsEj@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:xy1kHoPahe39uM+2XJySG4cZ7iY/HFlhqn6iZD7OjQZ Yb2lcRRzp8zmV7jDGt6sVtR2jVPWWqJQVCjYBeMAa6hJ3xcGfD TCEY/Vz6aiFewlKs659nwbGqOZLdmB6wpvnp6x62sNShFrdAUq 13Cz4nEZ2BpuUDgQEJaZ1freLGyDWjgRjH9rHgDhYoAjxN9ZuG 0y1F0/uvaOCeGnsCmQ8tUrrQ0kAjB7pj3HLi63W0vupFYWp2Od vXw/JStoOKoV9e4klKVtf9kqxY+fKW5c7MOSB3facOhfuSJpuh 9rfT/BRwrxrJl0dkZv0v9W6w2IdLvYD8rug5paXbMq6s7N4F12 2+kHahlQVy9dWFpjAYmc= Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, Alexander Shiyan Subject: [alsa-devel] [PATCH] ASoC: fsl: select SND_SOC_IMX_PCM_DMA where needed 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 204dec93eaa "ASoC: fsl: Allow to select individual common options", it is possible to enable SND_SOC_FSL_SSI and SND_SOC_FSL_SPDIF manually. However, these two options are for drivers that both require the imx-pcm-dma framework and result in a link error if that is not provided. This changes Kconfig to automatically select SND_SOC_IMX_PCM_DMA to avoid the problem, as we do for other drivers that need the same framework. Signed-off-by: Arnd Bergmann diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index fb26345..25abd21 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -9,6 +9,7 @@ config SND_SOC_FSL_SAI config SND_SOC_FSL_SSI tristate "Synchronous Serial Interface module support" + select SND_SOC_IMX_PCM_DMA help Say Y if you want to add Synchronous Serial Interface (SSI) support for the Freescale CPUs. @@ -17,6 +18,7 @@ config SND_SOC_FSL_SSI config SND_SOC_FSL_SPDIF tristate "Sony/Philips Digital Interface module support" + select SND_SOC_IMX_PCM_DMA select REGMAP_MMIO help Say Y if you want to add Sony/Philips Digital Interface (SPDIF)