From: Paul Cercueil <paul@crapouillou.net> To: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> Cc: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, linux-mips@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 02/11] ASoC: jz4740-i2s: Refactor DMA channel setup Date: Thu, 07 Jul 2022 10:30:51 +0100 [thread overview] Message-ID: <F39NER.PND5B77O5GFP@crapouillou.net> (raw) In-Reply-To: <20220706211330.120198-3-aidanmacdonald.0x0@gmail.com> Le mer., juil. 6 2022 at 22:13:21 +0100, Aidan MacDonald <aidanmacdonald.0x0@gmail.com> a écrit : > It's simpler to set up the playback and capture DMA settings > at driver probe time instead of during DAI probing. > > Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> > --- > sound/soc/jz4740/jz4740-i2s.c | 23 +++++------------------ > 1 file changed, 5 insertions(+), 18 deletions(-) > > diff --git a/sound/soc/jz4740/jz4740-i2s.c > b/sound/soc/jz4740/jz4740-i2s.c > index 298ff0a83931..ecd8df70d39c 100644 > --- a/sound/soc/jz4740/jz4740-i2s.c > +++ b/sound/soc/jz4740/jz4740-i2s.c > @@ -95,7 +95,6 @@ struct i2s_soc_info { > struct jz4740_i2s { > struct resource *mem; > void __iomem *base; > - dma_addr_t phys_base; Acked-by: Paul Cercueil <paul@crapouillou.net> Note that you can remove "mem" too, it's not used anywhere. Cheers, -Paul > > struct clk *clk_aic; > struct clk *clk_i2s; > @@ -370,21 +369,6 @@ static int jz4740_i2s_resume(struct > snd_soc_component *component) > return 0; > } > > -static void jz4740_i2s_init_pcm_config(struct jz4740_i2s *i2s) > -{ > - struct snd_dmaengine_dai_dma_data *dma_data; > - > - /* Playback */ > - dma_data = &i2s->playback_dma_data; > - dma_data->maxburst = 16; > - dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO; > - > - /* Capture */ > - dma_data = &i2s->capture_dma_data; > - dma_data->maxburst = 16; > - dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO; > -} > - > static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai) > { > struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai); > @@ -395,7 +379,6 @@ static int jz4740_i2s_dai_probe(struct > snd_soc_dai *dai) > if (ret) > return ret; > > - jz4740_i2s_init_pcm_config(i2s); > snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data, > &i2s->capture_dma_data); > > @@ -529,7 +512,11 @@ static int jz4740_i2s_dev_probe(struct > platform_device *pdev) > if (IS_ERR(i2s->base)) > return PTR_ERR(i2s->base); > > - i2s->phys_base = mem->start; > + i2s->playback_dma_data.maxburst = 16; > + i2s->playback_dma_data.addr = mem->start + JZ_REG_AIC_FIFO; > + > + i2s->capture_dma_data.maxburst = 16; > + i2s->capture_dma_data.addr = mem->start + JZ_REG_AIC_FIFO; > > i2s->clk_aic = devm_clk_get(dev, "aic"); > if (IS_ERR(i2s->clk_aic)) > -- > 2.35.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> Cc: alsa-devel@alsa-project.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, tiwai@suse.com, broonie@kernel.org Subject: Re: [PATCH 02/11] ASoC: jz4740-i2s: Refactor DMA channel setup Date: Thu, 07 Jul 2022 10:30:51 +0100 [thread overview] Message-ID: <F39NER.PND5B77O5GFP@crapouillou.net> (raw) In-Reply-To: <20220706211330.120198-3-aidanmacdonald.0x0@gmail.com> Le mer., juil. 6 2022 at 22:13:21 +0100, Aidan MacDonald <aidanmacdonald.0x0@gmail.com> a écrit : > It's simpler to set up the playback and capture DMA settings > at driver probe time instead of during DAI probing. > > Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> > --- > sound/soc/jz4740/jz4740-i2s.c | 23 +++++------------------ > 1 file changed, 5 insertions(+), 18 deletions(-) > > diff --git a/sound/soc/jz4740/jz4740-i2s.c > b/sound/soc/jz4740/jz4740-i2s.c > index 298ff0a83931..ecd8df70d39c 100644 > --- a/sound/soc/jz4740/jz4740-i2s.c > +++ b/sound/soc/jz4740/jz4740-i2s.c > @@ -95,7 +95,6 @@ struct i2s_soc_info { > struct jz4740_i2s { > struct resource *mem; > void __iomem *base; > - dma_addr_t phys_base; Acked-by: Paul Cercueil <paul@crapouillou.net> Note that you can remove "mem" too, it's not used anywhere. Cheers, -Paul > > struct clk *clk_aic; > struct clk *clk_i2s; > @@ -370,21 +369,6 @@ static int jz4740_i2s_resume(struct > snd_soc_component *component) > return 0; > } > > -static void jz4740_i2s_init_pcm_config(struct jz4740_i2s *i2s) > -{ > - struct snd_dmaengine_dai_dma_data *dma_data; > - > - /* Playback */ > - dma_data = &i2s->playback_dma_data; > - dma_data->maxburst = 16; > - dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO; > - > - /* Capture */ > - dma_data = &i2s->capture_dma_data; > - dma_data->maxburst = 16; > - dma_data->addr = i2s->phys_base + JZ_REG_AIC_FIFO; > -} > - > static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai) > { > struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai); > @@ -395,7 +379,6 @@ static int jz4740_i2s_dai_probe(struct > snd_soc_dai *dai) > if (ret) > return ret; > > - jz4740_i2s_init_pcm_config(i2s); > snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data, > &i2s->capture_dma_data); > > @@ -529,7 +512,11 @@ static int jz4740_i2s_dev_probe(struct > platform_device *pdev) > if (IS_ERR(i2s->base)) > return PTR_ERR(i2s->base); > > - i2s->phys_base = mem->start; > + i2s->playback_dma_data.maxburst = 16; > + i2s->playback_dma_data.addr = mem->start + JZ_REG_AIC_FIFO; > + > + i2s->capture_dma_data.maxburst = 16; > + i2s->capture_dma_data.addr = mem->start + JZ_REG_AIC_FIFO; > > i2s->clk_aic = devm_clk_get(dev, "aic"); > if (IS_ERR(i2s->clk_aic)) > -- > 2.35.1 >
next prev parent reply other threads:[~2022-07-07 9:31 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-06 21:13 [PATCH 00/11] ASoC: cleanups and improvements for jz4740-i2s Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-06 21:13 ` [PATCH 01/11] ASoC: jz4740-i2s: Remove Open Firmware dependency Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:16 ` Paul Cercueil 2022-07-07 9:16 ` Paul Cercueil 2022-07-06 21:13 ` [PATCH 02/11] ASoC: jz4740-i2s: Refactor DMA channel setup Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:30 ` Paul Cercueil [this message] 2022-07-07 9:30 ` Paul Cercueil 2022-07-06 21:13 ` [PATCH 03/11] ASoC: jz4740-i2s: Convert to regmap API Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-06 21:53 ` Paul Cercueil 2022-07-06 21:53 ` Paul Cercueil 2022-07-07 14:12 ` Aidan MacDonald 2022-07-07 14:12 ` Aidan MacDonald 2022-07-06 21:13 ` [PATCH 04/11] ASoC: jz4740-i2s: Simplify using regmap fields Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:36 ` Paul Cercueil 2022-07-07 9:36 ` Paul Cercueil 2022-07-07 14:13 ` Aidan MacDonald 2022-07-07 14:13 ` Aidan MacDonald 2022-07-06 21:13 ` [PATCH 05/11] ASoC: jz4740-i2s: Remove unused SoC version IDs Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:37 ` Paul Cercueil 2022-07-07 9:37 ` Paul Cercueil 2022-07-06 21:13 ` [PATCH 06/11] ASoC: jz4740-i2s: Use FIELD_PREP() macros in hw_params callback Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:40 ` Paul Cercueil 2022-07-07 9:40 ` Paul Cercueil 2022-07-06 21:13 ` [PATCH 07/11] ASoC: jz4740-i2s: Remove some unused macros Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:42 ` Paul Cercueil 2022-07-07 9:42 ` Paul Cercueil 2022-07-06 21:13 ` [PATCH 08/11] ASoC: jz4740-i2s: Align macro values and sort includes Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:42 ` Paul Cercueil 2022-07-07 9:42 ` Paul Cercueil 2022-07-06 21:13 ` [PATCH 09/11] ASoC: jz4740-i2s: Make the PLL clock name SoC-specific Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:47 ` Paul Cercueil 2022-07-07 9:47 ` Paul Cercueil 2022-07-07 14:24 ` Aidan MacDonald 2022-07-07 14:24 ` Aidan MacDonald 2022-07-06 21:13 ` [PATCH 10/11] ASoC: jz4740-i2s: Support S20_LE and S24_LE sample formats Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:53 ` Paul Cercueil 2022-07-07 9:53 ` Paul Cercueil 2022-07-07 14:25 ` Aidan MacDonald 2022-07-07 14:25 ` Aidan MacDonald 2022-07-06 21:13 ` [PATCH 11/11] ASoC: jz4740-i2s: Support continuous sample rate Aidan MacDonald 2022-07-06 21:13 ` Aidan MacDonald 2022-07-07 9:53 ` Paul Cercueil 2022-07-07 9:53 ` Paul Cercueil 2022-07-07 13:54 ` (subset) [PATCH 00/11] ASoC: cleanups and improvements for jz4740-i2s Mark Brown 2022-07-07 13:54 ` Mark Brown
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=F39NER.PND5B77O5GFP@crapouillou.net \ --to=paul@crapouillou.net \ --cc=aidanmacdonald.0x0@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.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.