From: "Martin Povišer" <povik+lin@cutebit.org>
To: "James Schulman" <james.schulman@cirrus.com>,
"David Rhodes" <david.rhodes@cirrus.com>,
"Lucas Tanure" <tanureal@opensource.cirrus.com>,
"Richard Fitzgerald" <rf@opensource.cirrus.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Martin Povišer" <povik+lin@cutebit.org>
Cc: Charles Keepax <ckeepax@opensource.cirrus.com>,
ChiYuan Huang <cy_huang@richtek.com>,
Matt Flax <flatmax@flatmax.com>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
- <patches@opensource.cirrus.com>,
alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, asahi@lists.linux.dev
Subject: [PATCH v2 02/11] ASoC: cs42l42: Add bitclock frequency argument to cs42l42_pll_config()
Date: Thu, 15 Sep 2022 11:44:35 +0200 [thread overview]
Message-ID: <20220915094444.11434-3-povik+lin@cutebit.org> (raw)
In-Reply-To: <20220915094444.11434-1-povik+lin@cutebit.org>
From: Richard Fitzgerald <rf@opensource.cirrus.com>
Clean up the handling of bitclock frequency by keeping all the logic
in cs42l42_pcm_hw_params(), which then simply passes the frequency as
an argument to cs42l42_pll_config().
The previous code had become clunky as a legacy of earlier versions of
the clock handling. The logic was split across cs42l42_pcm_hw_params()
and cs42l42_pll_config(), with the params-derived bclk stashed in
struct cs42l42_private only to pass it to cs42l42_pll_config().
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
---
sound/soc/codecs/cs42l42.c | 32 ++++++++++++++++----------------
sound/soc/codecs/cs42l42.h | 1 -
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 162540c153f9..4b92ee0e67c4 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -647,18 +647,12 @@ static const struct cs42l42_pll_params pll_ratio_table[] = {
{ 24576000, 1, 0x03, 0x40, 0x000000, 0x03, 0x10, 12288000, 128, 1}
};
-static int cs42l42_pll_config(struct snd_soc_component *component)
+static int cs42l42_pll_config(struct snd_soc_component *component, unsigned int clk)
{
struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component);
int i;
- u32 clk;
u32 fsync;
- if (!cs42l42->sclk)
- clk = cs42l42->bclk;
- else
- clk = cs42l42->sclk;
-
/* Don't reconfigure if there is an audio stream running */
if (cs42l42->stream_use) {
if (pll_ratio_table[cs42l42->pll_config].sclk == clk)
@@ -895,19 +889,25 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,
unsigned int width = (params_width(params) / 8) - 1;
unsigned int slot_width = 0;
unsigned int val = 0;
+ unsigned int bclk;
int ret;
cs42l42->srate = params_rate(params);
- /*
- * Assume 24-bit samples are in 32-bit slots, to prevent SCLK being
- * more than assumed (which would result in overclocking).
- */
- if (params_width(params) == 24)
- slot_width = 32;
+ if (cs42l42->sclk) {
+ /* machine driver has set the SCLK */
+ bclk = cs42l42->sclk;
+ } else {
+ /*
+ * Assume 24-bit samples are in 32-bit slots, to prevent SCLK being
+ * more than assumed (which would result in overclocking).
+ */
+ if (params_width(params) == 24)
+ slot_width = 32;
- /* I2S frame always has multiple of 2 channels */
- cs42l42->bclk = snd_soc_tdm_params_to_bclk(params, slot_width, 0, 2);
+ /* I2S frame always has multiple of 2 channels */
+ bclk = snd_soc_tdm_params_to_bclk(params, slot_width, 0, 2);
+ }
switch (substream->stream) {
case SNDRV_PCM_STREAM_CAPTURE:
@@ -947,7 +947,7 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,
break;
}
- ret = cs42l42_pll_config(component);
+ ret = cs42l42_pll_config(component, bclk);
if (ret)
return ret;
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h
index 50299c9f283a..b4ba1467c558 100644
--- a/sound/soc/codecs/cs42l42.h
+++ b/sound/soc/codecs/cs42l42.h
@@ -30,7 +30,6 @@ struct cs42l42_private {
struct snd_soc_jack *jack;
struct mutex irq_lock;
int pll_config;
- int bclk;
u32 sclk;
u32 srate;
u8 plug_state;
--
2.33.0
next prev parent reply other threads:[~2022-09-15 9:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 9:44 [PATCH v2 00/11] Support for CS42L83 on Apple machines Martin Povišer
2022-09-15 9:44 ` [PATCH v2 01/11] ASoC: dt-bindings: cs42l42: Add 'cs42l83' compatible Martin Povišer
2022-09-15 9:44 ` Martin Povišer [this message]
2022-09-15 9:44 ` [PATCH v2 03/11] ASoC: cs42l42: Use cs42l42->dev instead of &i2c_client->dev Martin Povišer
2022-09-15 9:44 ` [PATCH v2 04/11] ASoC: cs42l42: Split probe() and remove() into stages Martin Povišer
2022-09-15 12:20 ` Richard Fitzgerald
2022-09-15 13:45 ` Martin Povišer
2022-09-15 9:44 ` [PATCH v2 05/11] ASoC: cs42l42: Split cs42l42_resume into two functions Martin Povišer
2022-09-15 9:44 ` [PATCH v2 06/11] ASoC: cs42l42: Pass component and dai defs into common probe Martin Povišer
2022-09-15 9:44 ` [PATCH v2 07/11] ASoC: cs42l42: Split I2C identity into separate module Martin Povišer
2022-09-15 9:44 ` [PATCH v2 08/11] ASoC: cs42l42: Export regmap elements to core namespace Martin Povišer
2022-09-15 9:44 ` [PATCH v2 09/11] ASoC: cs42l83: Extend CS42L42 support to new part Martin Povišer
2022-09-15 9:44 ` [PATCH v2 10/11] ASoC: cs42l42: Implement 'set_bclk_ratio' Martin Povišer
2022-09-15 9:44 ` [PATCH v2 11/11] ASoC: cs42l42: Switch to dev_err_probe() helper Martin Povišer
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=20220915094444.11434-3-povik+lin@cutebit.org \
--to=povik+lin@cutebit.org \
--cc=alsa-devel@alsa-project.org \
--cc=asahi@lists.linux.dev \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=cy_huang@richtek.com \
--cc=david.rhodes@cirrus.com \
--cc=devicetree@vger.kernel.org \
--cc=flatmax@flatmax.com \
--cc=james.schulman@cirrus.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=patches@opensource.cirrus.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rf@opensource.cirrus.com \
--cc=robh+dt@kernel.org \
--cc=tanureal@opensource.cirrus.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®