From patchwork Thu Nov 10 15:17:54 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: 9421215 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 5DE5260512 for ; Thu, 10 Nov 2016 15:19:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53B8129771 for ; Thu, 10 Nov 2016 15:19:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 480C829778; Thu, 10 Nov 2016 15:19:37 +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=unavailable 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 EDAD229771 for ; Thu, 10 Nov 2016 15:19:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933992AbcKJPTg (ORCPT ); Thu, 10 Nov 2016 10:19:36 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:49697 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933884AbcKJPTf (ORCPT ); Thu, 10 Nov 2016 10:19:35 -0500 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGF00LM0MKGVW90@mailout3.samsung.com>; Fri, 11 Nov 2016 00:19:33 +0900 (KST) X-AuditID: cbfee61b-f796f6d000004092-f5-5824900553e0 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id A4.6D.16530.50094285; Fri, 11 Nov 2016 00:19:33 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGF00HZZMI40A50@mmp2.samsung.com>; Fri, 11 Nov 2016 00:19:33 +0900 (KST) From: Sylwester Nawrocki To: krzk@kernel.org, vinod.koul@intel.com, kgene@kernel.org Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, broonie@kernel.org, ckeepax@opensource.wolfsonmicro.com, ym0914@gmail.com, arnd@arndb.de, javier@osg.samsung.com, andi.shyti@samsung.com, sbkim73@samsung.com, Sylwester Nawrocki Subject: [PATCH 6/8] ASoC: samsung: pcm: Do not use platform_data for DMA parameters Date: Thu, 10 Nov 2016 16:17:54 +0100 Message-id: <1478791076-19528-7-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1478791076-19528-1-git-send-email-s.nawrocki@samsung.com> References: <1478791076-19528-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsVy+t9jQV3WCSoRBl0nxC22H3nGavF30jF2 i6kPn7BZ/Jtyg91i9dS/rBZv3q5hsuh//JrZ4vz5DewWmx5fY7WYcX4fk8XhN+2sFhdXfGGy eNm3n8WiZ8N/Vgc+j9+/JjF67Jx1l91j8Z6XTB6bVnWyeWxeUu/xcuJvNo8t/UDxvi2rGD0+ b5IL4Ixys8lITUxJLVJIzUvOT8nMS7dVCg1x07VQUshLzE21VYrQ9Q0JUlIoS8wpBfKMDNCA g3OAe7CSvl2CW8aVH38YC+4JVGz9cpK1gfEkbxcjJ4eEgInEhfmvmSFsMYkL99azdTFycQgJ zGKUuPx2PROE84tR4sy/CawgVWwChhK9R/sYQWwRAWuJnlt3wIqYBXYxSWzb3M8EkhAWCJNY dG01G4jNIqAqcbzxKTuIzSvgJnHz+0MmiHVyEiePTQYbyingLrF3xxYwWwio5veylSwTGHkX MDKsYpRILUguKE5KzzXKSy3XK07MLS7NS9dLzs/dxAiOoWfSOxgP73I/xCjAwajEwyvRqRIh xJpYVlyZe4hRgoNZSYT3QC9QiDclsbIqtSg/vqg0J7X4EKMp0GETmaVEk/OB8Z1XEm9oYm5i bmxgYW5paWKkJM7bOPtZuJBAemJJanZqakFqEUwfEwenVAPjxCUKNru5n+3/+/7SivwKDrYC y7+rtj5w+L+39cK7Zv9Yxgex3A/FWje5iex4VK/yT1BvyjW+A+xBzSsE/sjMe3DitsO9lws5 p5w7YXSmZe9zxSnS4avL9fOvBC+Z6nNlBevN7y//ignyTqi9ZmM4Z63obPfrCi/zZTilD/gw rtrRLTdtnen3Q0osxRmJhlrMRcWJAPON3hG3AgAA 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 All related platforms use either devicetree or the DMA slave map API for mapping DMA channels to slave devices so we can now stop using platform_data for passing DMA details. Signed-off-by: Sylwester Nawrocki Acked-by: Mark Brown --- sound/soc/samsung/pcm.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 43e367a..ccedab2 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -134,18 +134,22 @@ struct s3c_pcm_info { static struct snd_dmaengine_dai_dma_data s3c_pcm_stereo_out[] = { [0] = { .addr_width = 4, + .chan_name = "tx", }, [1] = { .addr_width = 4, + .chan_name = "tx", }, }; static struct snd_dmaengine_dai_dma_data s3c_pcm_stereo_in[] = { [0] = { .addr_width = 4, + .chan_name = "rx", }, [1] = { .addr_width = 4, + .chan_name = "rx", }, }; @@ -488,7 +492,6 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) struct s3c_pcm_info *pcm; struct resource *mem_res; struct s3c_audio_pdata *pcm_pdata; - dma_filter_fn filter; int ret; /* Check for valid device index */ @@ -555,13 +558,6 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) s3c_pcm_stereo_in[pdev->id].addr = mem_res->start + S3C_PCM_RXFIFO; s3c_pcm_stereo_out[pdev->id].addr = mem_res->start + S3C_PCM_TXFIFO; - filter = NULL; - if (pcm_pdata) { - s3c_pcm_stereo_in[pdev->id].filter_data = pcm_pdata->dma_capture; - s3c_pcm_stereo_out[pdev->id].filter_data = pcm_pdata->dma_playback; - filter = pcm_pdata->dma_filter; - } - pcm->dma_capture = &s3c_pcm_stereo_in[pdev->id]; pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id]; @@ -574,7 +570,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) goto err5; } - ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);