From patchwork Tue Oct 25 15:08:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 9394769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A6C46077F for ; Tue, 25 Oct 2016 15:09:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F218529637 for ; Tue, 25 Oct 2016 15:09:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6AB729640; Tue, 25 Oct 2016 15:09:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2499C2963C for ; Tue, 25 Oct 2016 15:09:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932526AbcJYPJJ (ORCPT ); Tue, 25 Oct 2016 11:09:09 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:56951 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938921AbcJYPJI (ORCPT ); Tue, 25 Oct 2016 11:09:08 -0400 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OFL00NFPZF663B0@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 26 Oct 2016 00:09:06 +0900 (KST) X-AuditID: cbfee61a-f79926d000005981-d2-580f75922c83 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id A1.81.22913.2957F085; Wed, 26 Oct 2016 00:09:06 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OFL00BR4ZEMB8A0@mmp1.samsung.com>; Wed, 26 Oct 2016 00:09:06 +0900 (KST) From: Sylwester Nawrocki To: broonie@kernel.org Cc: krzk@kernel.org, lgirdwood@gmail.com, lars@metafoo.de, alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH v2 3/4] ASoC: samsung: s3c24xx-i2s: Don't use platform_data for DMA parameters Date: Tue, 25 Oct 2016 17:08:40 +0200 Message-id: <1477408121-24716-3-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1477408121-24716-1-git-send-email-s.nawrocki@samsung.com> References: <1477408121-24716-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t9jAd1JpfwRBrN6dS2uXDzEZDH14RM2 i/PnN7BbLJk8n9Xi25UOJosZ5/cxWRx+087qwO6x4XMTm8fOWXfZPTat6mTzWPLmEKtH35ZV jB6fN8kFsEW52WSkJqakFimk5iXnp2TmpdsqhYa46VooKeQl5qbaKkXo+oYEKSmUJeaUAnlG BmjAwTnAPVhJ3y7BLWPqxEOMBTMFKr5N/sTWwHiEt4uRk0NCwERix9HVjBC2mMSFe+vZuhi5 OIQEljJKTLvxiBXC+cUoce7KdGaQKjYBQ4neo31gHSJAHbfndDKDFDELrGKU2LhkOitIQlgg QeLG5dMsIDaLgKpE17G7YA28Am4SLbfvMUOsk5M4eWwyUD0HB6eAu8TsXR4gphBQyf/bmhMY eRcwMgCNTC1ILihOSs81zEst1ytOzC0uzUvXS87P3cQIDu5nUjsYD+5yP8QowMGoxMO7I50/ Qog1say4MvcQowQHs5II7+cSoBBvSmJlVWpRfnxRaU5q8SFGU6CzJjJLiSbnAyMvryTe0MTc xNzYwMLc0tLESEmct3H2s3AhgfTEktTs1NSC1CKYPiYOTqkGRgezCdFzkh7HLVvAbft9p/OF ZDMffYu9XGseu1r/YjrzXY4z98wJo4JpDn+OiW7bezs6r8agsHFqrElXW6q7Xr72o00lN3+n bjedtfDY1v82C12n8Hw3tnqWlRLmMU2z9BaTNpe7SvyqUzZv/v3i0S+w/u6gbGB/R3r2dQaX 7+yrrk2RObP1uxJLcUaioRZzUXEiAEbmlliEAgAA X-MTR: 20000000000000000@CPGS Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the s3c24xx-dma is converted to use DMA map we can rely on the DMA subsystem to match DMA channels and slave devices, rather than passing DMA details from platform_data. Signed-off-by: Sylwester Nawrocki --- Changes since v1: - none. sound/soc/samsung/s3c24xx-i2s.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index d59a47d..29196a9 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -30,8 +30,6 @@ #include "dma.h" #include "s3c24xx-i2s.h" -#include - static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_out = { .addr_width = 2, }; @@ -449,14 +447,8 @@ static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai) static int s3c24xx_iis_dev_probe(struct platform_device *pdev) { - int ret = 0; struct resource *res; - struct s3c_audio_pdata *pdata = dev_get_platdata(&pdev->dev); - - if (!pdata) { - dev_err(&pdev->dev, "missing platform data"); - return -ENXIO; - } + int ret = 0; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -468,9 +460,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return PTR_ERR(s3c24xx_i2s.regs); s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO; - s3c24xx_i2s_pcm_stereo_out.filter_data = pdata->dma_playback; s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO; - s3c24xx_i2s_pcm_stereo_in.filter_data = pdata->dma_capture; ret = devm_snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1); @@ -479,8 +469,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return ret; } - ret = samsung_asoc_dma_platform_register(&pdev->dev, - pdata->dma_filter, + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret) pr_err("failed to register the dma: %d\n", ret);