From: Sylwester Nawrocki <s.nawrocki@samsung.com> 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 <s.nawrocki@samsung.com> 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 [thread overview] Message-ID: <1478276094-19135-6-git-send-email-s.nawrocki@samsung.com> (raw) In-Reply-To: <1478276094-19135-1-git-send-email-s.nawrocki@samsung.com> 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 <s.nawrocki@samsung.com> --- 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; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: s.nawrocki@samsung.com (Sylwester Nawrocki) To: linux-arm-kernel@lists.infradead.org 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 [thread overview] Message-ID: <1478276094-19135-6-git-send-email-s.nawrocki@samsung.com> (raw) In-Reply-To: <1478276094-19135-1-git-send-email-s.nawrocki@samsung.com> 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 <s.nawrocki@samsung.com> --- 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; -- 1.9.1
next prev parent reply other threads:[~2016-11-04 16:17 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-04 16:14 [PATCH RFC 0/7] DMA: S3C64XX: Conversion to the new channel request API Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-08 15:39 ` Charles Keepax 2016-11-08 15:39 ` Charles Keepax 2016-11-08 16:02 ` Sylwester Nawrocki 2016-11-08 16:02 ` Sylwester Nawrocki 2016-11-04 16:14 ` [PATCH RFC 1/7] dma: pl08x: Add support for the DMA slave map Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-04 23:26 ` Arnd Bergmann 2016-11-04 23:26 ` Arnd Bergmann 2016-11-07 15:41 ` Sylwester Nawrocki 2016-11-07 15:41 ` Sylwester Nawrocki 2016-11-07 19:55 ` Arnd Bergmann 2016-11-07 19:55 ` Arnd Bergmann 2016-11-14 11:51 ` Sylwester Nawrocki 2016-11-14 11:51 ` Sylwester Nawrocki 2016-11-04 16:14 ` [PATCH RFC 2/7] ARM: S3C64XX: Add DMA slave maps for PL080 devices Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-08 14:44 ` Charles Keepax 2016-11-08 14:44 ` Charles Keepax 2016-11-08 14:55 ` Charles Keepax 2016-11-08 14:55 ` Charles Keepax 2016-11-08 15:53 ` Sylwester Nawrocki 2016-11-08 15:53 ` Sylwester Nawrocki 2016-11-10 11:03 ` Charles Keepax 2016-11-10 11:03 ` Charles Keepax 2016-11-10 15:10 ` Sylwester Nawrocki 2016-11-10 15:10 ` Sylwester Nawrocki 2016-11-10 15:18 ` Charles Keepax 2016-11-10 15:18 ` Charles Keepax 2016-11-04 16:14 ` [PATCH RFC 3/7] spi: s3c64xx: Do not use platform_data for DMA parameters Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-04 17:12 ` Mark Brown 2016-11-04 17:12 ` Mark Brown 2016-11-07 2:51 ` Andi Shyti 2016-11-07 2:51 ` Andi Shyti 2016-11-04 16:14 ` Sylwester Nawrocki [this message] 2016-11-04 16:14 ` [PATCH RFC 4/7] ASoC: samsung: i2s: " Sylwester Nawrocki 2016-11-04 17:13 ` Mark Brown 2016-11-04 17:13 ` Mark Brown 2016-11-04 23:29 ` Arnd Bergmann 2016-11-04 23:29 ` Arnd Bergmann 2016-11-07 16:02 ` Sylwester Nawrocki 2016-11-07 16:02 ` Sylwester Nawrocki 2016-11-07 21:14 ` Arnd Bergmann 2016-11-07 21:14 ` Arnd Bergmann 2016-11-04 16:14 ` [PATCH RFC 5/7] ASoC: samsung: pcm: " Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-04 17:13 ` Mark Brown 2016-11-04 17:13 ` Mark Brown 2016-11-04 16:14 ` [PATCH RFC 6/7] ARM: S3C64XX: Drop unused DMA fields from struct s3c64xx_spi_csinfo Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki 2016-11-04 16:14 ` [PATCH RFC 7/7] ARM: S3C64XX: Drop initialization of unused struct s3c_audio_pdata fields Sylwester Nawrocki 2016-11-04 16:14 ` Sylwester Nawrocki
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1478276094-19135-6-git-send-email-s.nawrocki@samsung.com \ --to=s.nawrocki@samsung.com \ --cc=andi.shyti@samsung.com \ --cc=arnd@arndb.de \ --cc=broonie@kernel.org \ --cc=ckeepax@opensource.wolfsonmicro.com \ --cc=dmaengine@vger.kernel.org \ --cc=javier@osg.samsung.com \ --cc=kgene@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=sbkim73@samsung.com \ --cc=vinod.koul@intel.com \ --cc=ym0914@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.