From: Sylwester Nawrocki <s.nawrocki@samsung.com> 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 <s.nawrocki@samsung.com> Subject: [PATCH 6/8] ASoC: samsung: pcm: Do not use platform_data for DMA parameters Date: Thu, 10 Nov 2016 16:17:54 +0100 [thread overview] Message-ID: <1478791076-19528-7-git-send-email-s.nawrocki@samsung.com> (raw) In-Reply-To: <1478791076-19528-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> Acked-by: Mark Brown <broonie@kernel.org> --- 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); -- 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 6/8] ASoC: samsung: pcm: Do not use platform_data for DMA parameters Date: Thu, 10 Nov 2016 16:17:54 +0100 [thread overview] Message-ID: <1478791076-19528-7-git-send-email-s.nawrocki@samsung.com> (raw) In-Reply-To: <1478791076-19528-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> Acked-by: Mark Brown <broonie@kernel.org> --- 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); -- 1.9.1
next prev parent reply other threads:[~2016-11-10 15:19 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-10 15:17 [PATCH 0/8] DMA: s3c64xx: Conversion to the new channel request API Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-10 15:17 ` [PATCH 1/8] dma: pl08x: Add support for the DMA slave map Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-10 15:17 ` [PATCH 2/8] ARM: s3c64xx: Add DMA slave maps for PL080 devices Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-16 16:57 ` Krzysztof Kozlowski 2016-11-16 16:57 ` Krzysztof Kozlowski 2016-11-10 15:17 ` [PATCH 3/8] spi: s3c64xx: Do not use platform_data for DMA parameters Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-10 15:17 ` [PATCH 4/8] ARM: s3c64xx: Drop unused DMA fields from struct s3c64xx_spi_csinfo Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-16 16:58 ` Krzysztof Kozlowski 2016-11-16 16:58 ` Krzysztof Kozlowski 2016-11-10 15:17 ` [PATCH 5/8] ASoC: samsung: i2s: Do not use platform_data for DMA parameters Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki [this message] 2016-11-10 15:17 ` [PATCH 6/8] ASoC: samsung: pcm: " Sylwester Nawrocki 2016-11-10 15:17 ` [PATCH 7/8] ARM: s3c64xx: Drop initialization of unused struct s3c_audio_pdata fields Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-12-28 17:53 ` Krzysztof Kozlowski 2016-12-28 17:53 ` Krzysztof Kozlowski [not found] ` <CGME20161229103055epcas1p1dc69aec56d462e8c1605fe9e47ded562@epcas1p1.samsung.com> 2016-12-29 10:30 ` Sylwester Nawrocki 2016-12-29 10:30 ` Sylwester Nawrocki 2016-12-29 11:43 ` Krzysztof Kozlowski 2016-12-29 11:43 ` Krzysztof Kozlowski 2016-11-10 15:17 ` [PATCH 8/8] ARM: s3c24xx: Drop unused struct s3c_audio_pdata entries Sylwester Nawrocki 2016-11-10 15:17 ` Sylwester Nawrocki 2016-11-10 18:42 ` [PATCH 0/8] DMA: s3c64xx: Conversion to the new channel request API Krzysztof Kozlowski 2016-11-10 18:42 ` Krzysztof Kozlowski 2016-11-14 11:52 ` Sylwester Nawrocki 2016-11-14 11:52 ` Sylwester Nawrocki 2016-11-14 10:11 ` Charles Keepax 2016-11-14 10:11 ` Charles Keepax 2016-11-14 11:59 ` Sylwester Nawrocki 2016-11-14 11:59 ` Sylwester Nawrocki 2016-11-16 3:26 ` Vinod Koul 2016-11-16 3:26 ` Vinod Koul 2016-11-16 12:58 ` Sylwester Nawrocki 2016-11-16 12:58 ` Sylwester Nawrocki 2016-11-16 15:54 ` Arnd Bergmann 2016-11-16 15:54 ` Arnd Bergmann 2016-11-16 17:03 ` Krzysztof Kozlowski 2016-11-16 17:03 ` Krzysztof Kozlowski 2016-11-16 17:31 ` Sylwester Nawrocki 2016-11-16 17:31 ` Sylwester Nawrocki 2016-11-17 10:22 ` Vinod Koul 2016-11-17 10:22 ` Vinod Koul
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=1478791076-19528-7-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=krzk@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.