From patchwork Fri Nov 4 16:14:52 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: 9412809 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 6076A60723 for ; Fri, 4 Nov 2016 16:17:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5291A2B1C2 for ; Fri, 4 Nov 2016 16:17:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 475452B1C0; Fri, 4 Nov 2016 16:17:28 +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 F413B2B1C2 for ; Fri, 4 Nov 2016 16:17:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936211AbcKDQR1 (ORCPT ); Fri, 4 Nov 2016 12:17:27 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:54247 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936186AbcKDQR0 (ORCPT ); Fri, 4 Nov 2016 12:17:26 -0400 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OG400UYZL905F20@mailout2.samsung.com>; Sat, 05 Nov 2016 01:17:24 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-b9-581cb494e82b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id FF.D1.25310.494BC185; Sat, 5 Nov 2016 01:17:24 +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 <0OG400JDIL52T940@mmp2.samsung.com>; Sat, 05 Nov 2016 01:17:24 +0900 (KST) From: Sylwester Nawrocki To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Cc: vinod.koul@intel.com, broonie@kernel.org, ckeepax@opensource.wolfsonmicro.com, ym0914@gmail.com, arnd@arndb.de, kgene@kernel.org, javier@osg.samsung.com, andi.shyti@samsung.com, sbkim73@samsung.com, Sylwester Nawrocki Subject: [PATCH RFC 5/7] ASoC: samsung: pcm: Do not use platform_data for DMA parameters Date: Fri, 04 Nov 2016 17:14:52 +0100 Message-id: <1478276094-19135-7-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1478276094-19135-1-git-send-email-s.nawrocki@samsung.com> References: <1478276094-19135-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsVy+t9jQd0pW2QiDGZsMbHYfuQZq8XfScfY LaY+fMJm8W/KDXaL1VP/slq8ebuGyaL/8Wtmi02Pr7FazDi/j8ni8Jt2VouLK74wWbzs289i 0bPhP6sDr8fvX5MYPXbOusvusXjPSyaPTas62Tw2L6n3eDnxN5vHln6geN+WVYwenzfJBXBG udlkpCampBYppOYl56dk5qXbKoWGuOlaKCnkJeam2ipF6PqGBCkplCXmlAJ5RgZowME5wD1Y Sd8uwS2j58BM5oLNAhWnjy5gbWBczNvFyMkhIWAi0XzhIiuELSZx4d56ti5GLg4hgVmMEp+f vWOGcH4xSnTtb2YGqWITMJToPdrHCGKLCGRI3O48ww5SxCzwh1HiwI9udpCEsECUxNVPv8HG sgioSky9e4sJxOYVcJNY+OAmM8Q6OYmTxyaD1XAKuEtc3beCDcQWAqqZ9fIXywRG3gWMDKsY JVILkguKk9JzDfNSy/WKE3OLS/PS9ZLzczcxgiPnmdQOxoO73A8xCnAwKvHwNmyQiRBiTSwr rsw9xCjBwawkwlu/HijEm5JYWZValB9fVJqTWnyI0RTosInMUqLJ+cCoziuJNzQxNzE3NrAw t7Q0MVIS522c/SxcSCA9sSQ1OzW1ILUIpo+Jg1OqgfGCSsnnl79nvy3JWpwZnM/z3uHE5ngG 3oJpOX8mckzdNYvtkIHIUTVTXYfTth9mf3/kfvK10pfjWbr1ce5RbDF3GiV8XGZ7PE59lqGt zRq59dQyAff4u90fZ888VbHwPm//5v7Stha/U3dO2Kvwz7qzu/Egj+zrf7U9LiKHxW/wuOv+ 2OH2L12JpTgj0VCLuag4EQD9kUkOsgIAAA== 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);