From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Rob Herring <robh+dt@kernel.org>,
linux-gpio@vger.kernel.org, tiwai@suse.de,
Linus Walleij <linus.walleij@linaro.org>,
Stephen Boyd <sboyd@kernel.org>,
Daniel Matuschek <daniel@hifiberry.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Hui Wang <hui.wang@canonical.com>,
Matthias Reichl <hias@horus.com>,
broonie@kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Michael Turquette <mturquette@baylibre.com>,
linux-clk@vger.kernel.org
Subject: [RFC PATCH 05/16] ASoC: Intel: sof-pcm512x: reconfigure sclk in hw_params if needed
Date: Thu, 9 Apr 2020 14:58:30 -0500 [thread overview]
Message-ID: <20200409195841.18901-6-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200409195841.18901-1-pierre-louis.bossart@linux.intel.com>
The SCLK is resumed by the codec driver. In case the rate specified in
hw_params does not match the current configuration, disable, set the
new rate and restart the clock.
There is no operation on hw_free, the codec suspend routine will
disable/deprepare the clock.
Note that we don't change the DAI configuration when the DAC+ PRO is
detected. All changes for the codec master mode are handled in the
topology file (DAI configuration change and scheduling change)
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/boards/sof_pcm512x.c | 94 ++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c
index c1d2a53c1ec8..b5153ce954c7 100644
--- a/sound/soc/intel/boards/sof_pcm512x.c
+++ b/sound/soc/intel/boards/sof_pcm512x.c
@@ -145,6 +145,31 @@ static int sof_pcm512x_codec_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}
+static int aif1_update_rate_den(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card);
+ struct snd_ratnum rats_no_pll;
+ unsigned int num = 0, den = 0;
+ int err;
+
+ rats_no_pll.num = clk_get_rate(ctx->sclk) / 64;
+ rats_no_pll.den_min = 1;
+ rats_no_pll.den_max = 128;
+ rats_no_pll.den_step = 1;
+
+ err = snd_interval_ratnum(hw_param_interval(params,
+ SNDRV_PCM_HW_PARAM_RATE),
+ 1, &rats_no_pll, &num, &den);
+ if (err >= 0 && den) {
+ params->rate_num = num;
+ params->rate_den = den;
+ }
+
+ return 0;
+}
+
static int aif1_startup(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -156,6 +181,74 @@ static int aif1_startup(struct snd_pcm_substream *substream)
return 0;
}
+static int aif1_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card);
+ struct device *dev = rtd->card->dev;
+ int current_rate;
+ int sclk_rate;
+ int channels;
+ int width;
+ int rate;
+ int ret = 0;
+
+ if (ctx->is_dac_pro) {
+ rate = params_rate(params);
+ channels = params_channels(params);
+ width = snd_pcm_format_physical_width(params_format(params));
+
+ if (rate % 24000)
+ sclk_rate = 22579200;
+ else
+ sclk_rate = 24576000;
+
+ current_rate = clk_get_rate(ctx->sclk);
+ if (current_rate != sclk_rate) {
+ /*
+ * The sclk clock is started and stopped by the codec
+ * resume/suspend functions. If the rate isn't correct,
+ * stop, set the new rate and restart the clock
+ */
+
+ dev_dbg(dev, "reconfiguring SCLK to rate %d\n",
+ sclk_rate);
+
+ clk_disable_unprepare(ctx->sclk);
+
+ ret = clk_set_rate(ctx->sclk, sclk_rate);
+ if (ret) {
+ dev_err(dev, "Could not set SCLK rate %d\n",
+ sclk_rate);
+ return ret;
+ }
+
+ ret = clk_prepare_enable(ctx->sclk);
+ if (ret) {
+ dev_err(dev, "Failed to enable SCLK: %d\n",
+ ret);
+ return ret;
+ }
+ }
+
+ ret = aif1_update_rate_den(substream, params);
+ if (ret) {
+ dev_err(dev, "Failed to update rate denominator: %d\n", ret);
+ return ret;
+ }
+
+ ret = snd_soc_dai_set_bclk_ratio(rtd->codec_dai,
+ channels * width);
+ if (ret) {
+ dev_err(dev, "Failed to set bclk ratio : %d\n", ret);
+ return ret;
+ }
+ }
+
+ return ret;
+}
+
static void aif1_shutdown(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -167,6 +260,7 @@ static void aif1_shutdown(struct snd_pcm_substream *substream)
static const struct snd_soc_ops sof_pcm512x_ops = {
.startup = aif1_startup,
+ .hw_params = aif1_hw_params,
.shutdown = aif1_shutdown,
};
--
2.20.1
next prev parent reply other threads:[~2020-04-09 20:04 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 19:58 [RFC PATCH 00/16] ASoC/SOF/clk/gpio/dt: add Hifiberry DAC+ PRO support Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 01/16] ASoC: pcm512x: expose 6 GPIOs Pierre-Louis Bossart
2020-04-14 17:09 ` Andy Shevchenko
2020-04-14 17:52 ` Pierre-Louis Bossart
2020-04-15 9:49 ` Andy Shevchenko
2020-04-16 11:42 ` Linus Walleij
2020-04-16 14:25 ` Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 02/16] ASoC: pcm512x: use "sclk" string to retrieve clock Pierre-Louis Bossart
2020-04-14 17:11 ` Andy Shevchenko
2020-04-14 17:54 ` Pierre-Louis Bossart
2020-04-15 9:52 ` Andy Shevchenko
2020-04-15 14:19 ` Pierre-Louis Bossart
2020-04-15 15:10 ` Andy Shevchenko
2020-04-14 17:45 ` Mark Brown
2020-04-14 18:14 ` Pierre-Louis Bossart
2020-04-14 18:27 ` Mark Brown
2020-04-14 19:15 ` Pierre-Louis Bossart
2020-04-14 19:50 ` Mark Brown
2020-04-14 20:13 ` Pierre-Louis Bossart
2020-04-14 21:02 ` Pierre-Louis Bossart
2020-04-15 11:07 ` Mark Brown
2020-04-15 11:36 ` Mark Brown
2020-04-15 14:44 ` Pierre-Louis Bossart
2020-04-15 16:22 ` Mark Brown
2020-04-15 17:26 ` Pierre-Louis Bossart
2020-04-15 19:50 ` Mark Brown
2020-04-15 20:22 ` Pierre-Louis Bossart
2020-04-15 20:39 ` Mark Brown
2020-04-09 19:58 ` [RFC PATCH 03/16] ASoC: Intel: sof-pcm512x: use gpiod for LED Pierre-Louis Bossart
2020-04-14 17:17 ` Andy Shevchenko
2020-04-14 17:52 ` Mark Brown
2020-04-14 17:57 ` Pierre-Louis Bossart
2020-04-15 9:51 ` Andy Shevchenko
2020-04-09 19:58 ` [RFC PATCH 04/16] ASoC: Intel: sof-pcm512x: detect Hifiberry DAC+ PRO Pierre-Louis Bossart
2020-04-14 17:20 ` Andy Shevchenko
2020-04-14 18:02 ` Pierre-Louis Bossart
2020-04-15 9:55 ` Andy Shevchenko
2020-04-15 14:07 ` Pierre-Louis Bossart
2020-04-15 15:05 ` Andy Shevchenko
2020-04-09 19:58 ` Pierre-Louis Bossart [this message]
2020-04-14 17:24 ` [RFC PATCH 05/16] ASoC: Intel: sof-pcm512x: reconfigure sclk in hw_params if needed Andy Shevchenko
2020-04-14 18:06 ` Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 06/16] ASoC: Intel: sof-pcm512x: select HIFIBERRY_DACPRO clk Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 07/16] clk: hifiberry-dacpro: initial import Pierre-Louis Bossart
2020-04-14 17:31 ` Andy Shevchenko
2020-04-14 18:09 ` Pierre-Louis Bossart
2020-04-15 10:00 ` Andy Shevchenko
2020-04-09 19:58 ` [RFC PATCH 08/16] clk: hifiberry-dacpro: update SDPX/copyright Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 09/16] clk: hifiberry-dacpro: style cleanups, use devm_ Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 10/16] clk: hifiberry-dacpro: add OF dependency Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 11/16] clk: hifiberry-dacpro: transition to _hw functions Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 12/16] clk: hifiberry-dacpro: add ACPI support Pierre-Louis Bossart
2020-04-22 9:32 ` Stephen Boyd
2020-04-22 9:47 ` Andy Shevchenko
2020-04-22 9:54 ` Pierre-Louis Bossart
2020-04-22 20:52 ` Stephen Boyd
2020-04-22 21:08 ` Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 13/16] clk: hifiberry-dacpro: add "sclk" lookup Pierre-Louis Bossart
2020-04-22 9:35 ` Stephen Boyd
2020-04-22 9:51 ` Pierre-Louis Bossart
2020-04-22 11:54 ` Andy Shevchenko
2020-04-09 19:58 ` [RFC PATCH 14/16] clk: hifiberry-dacpro: toggle GPIOs on prepare/unprepare Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 15/16] clk: hifiberry-dacpro: add delay on clock prepare/deprepare Pierre-Louis Bossart
2020-04-09 19:58 ` [RFC PATCH 16/16] ASoC: dt-bindings: add document for Hifiberry DAC+ PRO clock Pierre-Louis Bossart
2020-04-14 17:27 ` Andy Shevchenko
2020-04-14 18:10 ` Pierre-Louis Bossart
2020-04-14 16:50 ` [RFC PATCH 00/16] ASoC/SOF/clk/gpio/dt: add Hifiberry DAC+ PRO support Andy Shevchenko
2020-04-14 16:57 ` Pierre-Louis Bossart
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=20200409195841.18901-6-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=broonie@kernel.org \
--cc=daniel@hifiberry.com \
--cc=hias@horus.com \
--cc=hui.wang@canonical.com \
--cc=linus.walleij@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=tiwai@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).