From patchwork Sun Jun 16 13:25:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 2728251 Return-Path: X-Original-To: patchwork-linux-arm@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 ECA97C0AB1 for ; Sun, 16 Jun 2013 13:35:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C80C2015F for ; Sun, 16 Jun 2013 13:35:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14F5020117 for ; Sun, 16 Jun 2013 13:35:33 +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 1UoD2T-0003T1-EO; Sun, 16 Jun 2013 13:30:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoD0c-0003WQ-3F; Sun, 16 Jun 2013 13:28:42 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoCzA-0003Mg-Dx for linux-arm-kernel@lists.infradead.org; Sun, 16 Jun 2013 13:27:15 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1UoCy7-0004yx-Ur; Sun, 16 Jun 2013 15:26:07 +0200 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1UoCy2-0007ND-2I; Sun, 16 Jun 2013 15:26:02 +0200 From: Markus Pargmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 03/11] ASoC: fsl: Move soc_ac97_ops from imx-ssi to fsl_ssi Date: Sun, 16 Jun 2013 15:25:09 +0200 Message-Id: <1371389117-19729-4-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1371389117-19729-1-git-send-email-mpa@pengutronix.de> References: <1371389117-19729-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130616_092713_048470_B79EF2AE X-CRM114-Status: GOOD ( 20.49 ) X-Spam-Score: -3.0 (---) Cc: Fabio Estevam , alsa-devel@alsa-project.org, Lars-Peter Clausen , devicetree-discuss@lists.ozlabs.org, Mark Brown , Timur Tabi , Liam Girdwood , Grant Likely , Sascha Hauer , Markus Pargmann , Shawn Guo 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 fsl_ssi and imx-ssi can be both enabled at the same time. To be able to add AC97 support to fsl_ssi, soc_ac97_ops have to be available to both drivers. fsl_ssi has DT support and should be the only driver at some point in the future. This patch moves the definition of soc_ac97_ops to fsl_ssi. imx-ssi copies its own ac97 ops struct into soc_ac97_ops when used in AC97 mode. Signed-off-by: Markus Pargmann --- sound/soc/fsl/Kconfig | 1 + sound/soc/fsl/fsl_ssi.c | 8 ++++++++ sound/soc/fsl/imx-ssi.c | 7 +++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 7860cc2..74ef96e 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -107,6 +107,7 @@ if SND_IMX_SOC config SND_SOC_IMX_SSI tristate + select SND_SOC_FSL_SSI config SND_SOC_IMX_PCM_FIQ bool diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 2f2d837..db55499 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -587,6 +587,14 @@ static const struct snd_soc_component_driver fsl_ssi_component = { .name = "fsl-ssi", }; +/* + * FIXME: As soon as all boards using imx-ssi AC97 mode are able to use + * fsl-ssi, soc_ac97_ops can be used exclusively in this driver without copying + * the struct. AC97 support can then be removed from imx-ssi. + */ +struct snd_ac97_bus_ops soc_ac97_ops; +EXPORT_SYMBOL_GPL(soc_ac97_ops); + /* Show the statistics of a flag only if its interrupt is enabled. The * compiler will optimze this code to a no-op if the interrupt is not * enabled. diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 16ae16d..3760220 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -501,13 +501,14 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) imx_ssi_ac97_read(ac97, 0); } -struct snd_ac97_bus_ops soc_ac97_ops = { +static struct snd_ac97_bus_ops imx_ssi_soc_ac97_ops = { .read = imx_ssi_ac97_read, .write = imx_ssi_ac97_write, .reset = imx_ssi_ac97_reset, .warm_reset = imx_ssi_ac97_warm_reset }; -EXPORT_SYMBOL_GPL(soc_ac97_ops); + +extern struct snd_ac97_bus_ops soc_ac97_ops; static int imx_ssi_probe(struct platform_device *pdev) { @@ -547,6 +548,8 @@ static int imx_ssi_probe(struct platform_device *pdev) } if (ssi->flags & IMX_SSI_USE_AC97) { + memcpy(&soc_ac97_ops, &imx_ssi_soc_ac97_ops, + sizeof(soc_ac97_ops)); if (ac97_ssi) { dev_err(&pdev->dev, "AC'97 SSI already registered\n"); ret = -EBUSY;