From: Nicolas Ferre <nicolas.ferre@microchip.com>
To: Quentin Schulz <quentin.schulz@free-electrons.com>,
<mturquette@baylibre.com>, <sboyd@codeaurora.org>,
<robh+dt@kernel.org>, <mark.rutland@arm.com>,
<lgirdwood@gmail.com>, <broonie@kernel.org>,
<alexandre.belloni@free-electrons.com>, <linux@armlinux.org.uk>,
<boris.brezillon@free-electrons.com>, <perex@perex.cz>,
<tiwai@suse.com>
Cc: <cyrille.pitchen@wedev4u.fr>,
<thomas.petazzoni@free-electrons.com>,
<linux-clk@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <alsa-devel@alsa-project.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v4 8/9] ASoC: atmel-classd: remove aclk clock
Date: Tue, 25 Jul 2017 17:40:14 +0200 [thread overview]
Message-ID: <97863fa5-06aa-598b-050f-4454c720420a@microchip.com> (raw)
In-Reply-To: <645aa35fec4a2384ca2f3039615ee6598602f9e2.1500968090.git-series.quentin.schulz@free-electrons.com>
On 25/07/2017 at 09:37, Quentin Schulz wrote:
> Since gclk (generated-clk) is now able to determine the rate of the
> audio_pll, there is no need for classd to have a direct phandle to the
> audio_pll while already having a phandle to gclk.
>
> Thus, remove all mentions to aclk in classd driver and update macros and
> variable names.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
> Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> ---
> sound/soc/atmel/atmel-classd.c | 47 ++++++++++-------------------------
> 1 file changed, 14 insertions(+), 33 deletions(-)
>
> diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
> index b7ef8c5..be6b775 100644
> --- a/sound/soc/atmel/atmel-classd.c
> +++ b/sound/soc/atmel/atmel-classd.c
> @@ -32,7 +32,6 @@ struct atmel_classd {
> struct regmap *regmap;
> struct clk *pclk;
> struct clk *gclk;
> - struct clk *aclk;
> int irq;
> const struct atmel_classd_pdata *pdata;
> };
> @@ -330,11 +329,6 @@ static int atmel_classd_codec_dai_startup(struct snd_pcm_substream *substream,
> {
> struct snd_soc_pcm_runtime *rtd = substream->private_data;
> struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
> - int ret;
> -
> - ret = clk_prepare_enable(dd->aclk);
> - if (ret)
> - return ret;
>
> return clk_prepare_enable(dd->gclk);
> }
> @@ -357,31 +351,31 @@ static int atmel_classd_codec_dai_digital_mute(struct snd_soc_dai *codec_dai,
> return 0;
> }
>
> -#define CLASSD_ACLK_RATE_11M2896_MPY_8 (112896 * 100 * 8)
> -#define CLASSD_ACLK_RATE_12M288_MPY_8 (12288 * 1000 * 8)
> +#define CLASSD_GCLK_RATE_11M2896_MPY_8 (112896 * 100 * 8)
> +#define CLASSD_GCLK_RATE_12M288_MPY_8 (12288 * 1000 * 8)
>
> static struct {
> int rate;
> int sample_rate;
> int dsp_clk;
> - unsigned long aclk_rate;
> + unsigned long gclk_rate;
> } const sample_rates[] = {
> { 8000, CLASSD_INTPMR_FRAME_8K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
> { 16000, CLASSD_INTPMR_FRAME_16K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
> { 32000, CLASSD_INTPMR_FRAME_32K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
> { 48000, CLASSD_INTPMR_FRAME_48K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
> { 96000, CLASSD_INTPMR_FRAME_96K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
> { 22050, CLASSD_INTPMR_FRAME_22K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_ACLK_RATE_11M2896_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_GCLK_RATE_11M2896_MPY_8 },
> { 44100, CLASSD_INTPMR_FRAME_44K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_ACLK_RATE_11M2896_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_GCLK_RATE_11M2896_MPY_8 },
> { 88200, CLASSD_INTPMR_FRAME_88K,
> - CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_ACLK_RATE_11M2896_MPY_8 },
> + CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_GCLK_RATE_11M2896_MPY_8 },
> };
>
> static int
> @@ -410,13 +404,12 @@ atmel_classd_codec_dai_hw_params(struct snd_pcm_substream *substream,
> }
>
> dev_dbg(codec->dev,
> - "Selected SAMPLE_RATE of %dHz, ACLK_RATE of %ldHz\n",
> - sample_rates[best].rate, sample_rates[best].aclk_rate);
> + "Selected SAMPLE_RATE of %dHz, GCLK_RATE of %ldHz\n",
> + sample_rates[best].rate, sample_rates[best].gclk_rate);
>
> clk_disable_unprepare(dd->gclk);
> - clk_disable_unprepare(dd->aclk);
>
> - ret = clk_set_rate(dd->aclk, sample_rates[best].aclk_rate);
> + ret = clk_set_rate(dd->gclk, sample_rates[best].gclk_rate);
> if (ret)
> return ret;
>
> @@ -426,10 +419,6 @@ atmel_classd_codec_dai_hw_params(struct snd_pcm_substream *substream,
>
> snd_soc_update_bits(codec, CLASSD_INTPMR, mask, val);
>
> - ret = clk_prepare_enable(dd->aclk);
> - if (ret)
> - return ret;
> -
> return clk_prepare_enable(dd->gclk);
> }
>
> @@ -441,7 +430,6 @@ atmel_classd_codec_dai_shutdown(struct snd_pcm_substream *substream,
> struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
>
> clk_disable_unprepare(dd->gclk);
> - clk_disable_unprepare(dd->aclk);
> }
>
> static int atmel_classd_codec_dai_prepare(struct snd_pcm_substream *substream,
> @@ -596,13 +584,6 @@ static int atmel_classd_probe(struct platform_device *pdev)
> return ret;
> }
>
> - dd->aclk = devm_clk_get(dev, "aclk");
> - if (IS_ERR(dd->aclk)) {
> - ret = PTR_ERR(dd->aclk);
> - dev_err(dev, "failed to get audio clock: %d\n", ret);
> - return ret;
> - }
> -
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> io_base = devm_ioremap_resource(dev, res);
> if (IS_ERR(io_base)) {
>
--
Nicolas Ferre
next prev parent reply other threads:[~2017-07-25 15:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 7:37 [PATCH v4 0/9] add support for Sama5d2 audio PLLs and enable ClassD Quentin Schulz
2017-07-25 7:37 ` [PATCH v4 1/9] clk: at91: clk-generated: remove useless divisor loop Quentin Schulz
2017-07-25 15:28 ` Nicolas Ferre
2017-07-25 7:37 ` [PATCH v4 2/9] dt-bindings: clk: at91: add audio plls to the compatible list Quentin Schulz
2017-07-25 15:45 ` Nicolas Ferre
2017-07-25 7:37 ` [PATCH v4 3/9] clk: at91: add audio pll clock drivers Quentin Schulz
2017-07-25 7:37 ` [PATCH v4 4/9] ARM: dts: at91: sama5d2: add classd nodes Quentin Schulz
2017-07-26 6:59 ` Alexandre Belloni
2017-07-25 7:37 ` [PATCH v4 5/9] clk: at91: clk-generated: create function to find best_diff Quentin Schulz
2017-07-25 15:33 ` Nicolas Ferre
2017-07-25 7:37 ` [PATCH v4 6/9] clk: at91: clk-generated: make gclk determine audio_pll rate Quentin Schulz
2017-07-25 15:37 ` Nicolas Ferre
2017-07-25 7:37 ` [PATCH v4 7/9] ASoC: atmel-classd: remove aclk clock from DT binding Quentin Schulz
2017-07-25 15:38 ` Nicolas Ferre
2017-07-25 7:37 ` [PATCH v4 8/9] ASoC: atmel-classd: remove aclk clock Quentin Schulz
2017-07-25 15:40 ` Nicolas Ferre [this message]
2017-07-25 7:37 ` [PATCH v4 9/9] ARM: dts: at91: sama5d2_xplained: add pin muxing and enable classd Quentin Schulz
2017-07-26 6:59 ` Alexandre Belloni
2017-07-25 15:44 ` [PATCH v4 0/9] add support for Sama5d2 audio PLLs and enable ClassD Nicolas Ferre
2017-07-26 6:57 ` Alexandre Belloni
2017-07-26 7:08 ` Quentin Schulz
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=97863fa5-06aa-598b-050f-4454c720420a@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=alsa-devel@alsa-project.org \
--cc=boris.brezillon@free-electrons.com \
--cc=broonie@kernel.org \
--cc=cyrille.pitchen@wedev4u.fr \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=perex@perex.cz \
--cc=quentin.schulz@free-electrons.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=thomas.petazzoni@free-electrons.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®