From patchwork Fri Nov 4 16:14:51 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: 9412805 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 9846B60585 for ; Fri, 4 Nov 2016 16:17:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 898222B1C0 for ; Fri, 4 Nov 2016 16:17:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DE0A2B1C5; Fri, 4 Nov 2016 16:17:24 +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 133B32B1C2 for ; Fri, 4 Nov 2016 16:17:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936209AbcKDQRW (ORCPT ); Fri, 4 Nov 2016 12:17:22 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:46927 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936186AbcKDQRV (ORCPT ); Fri, 4 Nov 2016 12:17:21 -0400 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OG4029TNL8HZJ50@mailout4.samsung.com>; Sat, 05 Nov 2016 01:17:20 +0900 (KST) X-AuditID: cbfee61b-f796f6d000004092-08-581cb48f89ab Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id A5.12.16530.F84BC185; Sat, 5 Nov 2016 01:17:19 +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:19 +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 4/7] ASoC: samsung: i2s: Do not use platform_data for DMA parameters Date: Fri, 04 Nov 2016 17:14:51 +0100 Message-id: <1478276094-19135-6-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+NgFprHIsWRmVeSWpSXmKPExsVy+t9jQd3+LTIRBsu6rC22H3nGavF30jF2 i6kPn7BZ/Jtyg91i9dS/rBZv3q5hsuh//JrZYtPja6wWM87vY7I4/Kad1eLiii9MFi/79rNY 9Gz4z+rA6/H71yRGj52z7rJ7LN7zkslj06pONo/NS+o9Xk78zeaxpR8o3rdlFaPH501yAZxR bjYZqYkpqUUKqXnJ+SmZeem2SqEhbroWSgp5ibmptkoRur4hQUoKZYk5pUCekQEacHAOcA9W 0rdLcMtY3PCOuaBFsOLjo2dsDYzNfF2MnBwSAiYSR9o+MkPYYhIX7q1n62Lk4hASmMUocWbO NXYI5xejxOr5P5lAqtgEDCV6j/YxgtgiAhkStzvPgBUxC/xhlDjwo5sdJCEsECXxaPoeoFEc HCwCqhIv7hiBhHkF3CSePvjJArFNTuLkscmsIDangLvE1X0r2EBsIaCaWS9/sUxg5F3AyLCK USK1ILmgOCk91ygvtVyvODG3uDQvXS85P3cTIzhunknvYDy8y/0QowAHoxIPb+IUmQgh1sSy 4srcQ4wSHMxKIrz164FCvCmJlVWpRfnxRaU5qcWHGE2B7prILCWanA+M6bySeEMTcxNzYwML c0tLEyMlcd7G2c/ChQTSE0tSs1NTC1KLYPqYODilGhgn3mq9x6cnblpceSirf/75pJql/Yt7 Fevb2eOWeM9YYH5WyfH795f2X6QkJ2y6u/KYQ6TElE8GXJ3fZbylJx4tCjpskeRecFH/9Z4p DjVmcxqOX3G+73jy7rmgkpi9goeePJpwRd6kdI7zo8eXD35ty+uSs357qqJ068QAj6v17Pw9 maxn7k5WYinOSDTUYi4qTgQAFtmu+bECAAA= 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/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;