From patchwork Thu Nov 10 15:17:53 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: 9421213 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 C606060720 for ; Thu, 10 Nov 2016 15:19:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC03429781 for ; Thu, 10 Nov 2016 15:19:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA8AC29783; Thu, 10 Nov 2016 15:19:29 +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 6C62529776 for ; Thu, 10 Nov 2016 15:19:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934001AbcKJPT2 (ORCPT ); Thu, 10 Nov 2016 10:19:28 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:39672 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933884AbcKJPT2 (ORCPT ); Thu, 10 Nov 2016 10:19:28 -0500 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGF030YGMKB4GA0@mailout1.samsung.com>; Fri, 11 Nov 2016 00:19:26 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-52-58248ffef6b9 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 8F.CC.25310.EFF84285; Fri, 11 Nov 2016 00:19:26 +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:26 +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 5/8] ASoC: samsung: i2s: Do not use platform_data for DMA parameters Date: Thu, 10 Nov 2016 16:17:53 +0100 Message-id: <1478791076-19528-6-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+t9jQd1//SoRBit+KlpsP/KM1eLvpGPs FlMfPmGz+DflBrvF6ql/WS3evF3DZNH/+DWzxfnzG9gtNj2+xmox4/w+JovDb9pZLS6u+MJk 8bJvP4tFz4b/rA58Hr9/TWL02DnrLrvH4j0vmTw2repk89i8pN7j5cTfbB5b+oHifVtWMXp8 3iQXwBnlZpORmpiSWqSQmpecn5KZl26rFBripmuhpJCXmJtqqxSh6xsSpKRQlphTCuQZGaAB B+cA92AlfbsEt4zjM/awFHwQrPj6/ShbA+NTvi5GTg4JAROJ5Q82sEPYYhIX7q1n62Lk4hAS mMUocXjFMSYI5xejxM+pPxhBqtgEDCV6j/aB2SIC1hI9t+6AFTEL7GKS2La5nwkkISwQJtH8 YyoLiM0ioCox/c5GsAZeATeJKZe/s0Ksk5M4eWwymM0p4C6xd8cWMFsIqOb3spUsExh5FzAy rGKUSC1ILihOSs81zEst1ytOzC0uzUvXS87P3cQIjqFnUjsYD+5yP8QowMGoxMMr0akSIcSa WFZcmXuIUYKDWUmE90AvUIg3JbGyKrUoP76oNCe1+BCjKdBhE5mlRJPzgfGdVxJvaGJuYm5s YGFuaWlipCTO2zj7WbiQQHpiSWp2ampBahFMHxMHp1QD47IEU5fzWofT2YUP1XzKzRcyMooL X6Gk1nV1VkuH/7R/E/hu272JXSPXp/ba90eH54V3G8rZJv4WcnwZXGyrpHykaqo+1+TolG3v jmhz1DiG9FVZrfz47FLQtMa3d7J2VvJmL3ohKnRQfUd/uxqXu1/A0uyjW/8fihI6Y6SpFmAy c1rh4538SizFGYmGWsxFxYkAupiY6bcCAAA= 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 Tested-by: Charles Keepax Acked-by: Mark Brown --- sound/soc/samsung/i2s.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 7e32cf4..95a9a3f 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -90,7 +90,6 @@ struct i2s_dai { struct snd_dmaengine_dai_dma_data dma_playback; struct snd_dmaengine_dai_dma_data dma_capture; struct snd_dmaengine_dai_dma_data idma_playback; - dma_filter_fn filter; u32 quirks; u32 suspend_i2smod; u32 suspend_i2scon; @@ -1244,7 +1243,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) return ret; return samsung_asoc_dma_platform_register(&pdev->dev, - sec_dai->filter, "tx-sec", NULL); + NULL, "tx-sec", NULL); } pri_dai = i2s_alloc_dai(pdev, false); @@ -1262,10 +1261,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) return -EINVAL; } - pri_dai->dma_playback.filter_data = i2s_pdata->dma_playback; - pri_dai->dma_capture.filter_data = i2s_pdata->dma_capture; - pri_dai->filter = i2s_pdata->dma_filter; - if (&i2s_pdata->type) i2s_cfg = &i2s_pdata->type.i2s; @@ -1327,11 +1322,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) sec_dai->dma_playback.addr = regs_base + I2STXDS; sec_dai->dma_playback.chan_name = "tx-sec"; - if (!np) { - sec_dai->dma_playback.filter_data = i2s_pdata->dma_play_sec; - sec_dai->filter = i2s_pdata->dma_filter; - } - sec_dai->dma_playback.addr_width = 4; sec_dai->addr = pri_dai->addr; sec_dai->clk = pri_dai->clk; @@ -1353,7 +1343,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (ret < 0) goto err_free_dai; - ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret < 0) goto err_free_dai;