* [PATCH v2] ASoC: cros_ec_codec: Support setting bclk ratio
@ 2020-01-25 16:29 Yu-Hsuan Hsu
2020-01-26 10:25 ` Tzung-Bi Shih
0 siblings, 1 reply; 2+ messages in thread
From: Yu-Hsuan Hsu @ 2020-01-25 16:29 UTC (permalink / raw)
To: linux-kernel
Cc: Cheng-Yi Chiang, Tzung-Bi Shih, Enric Balletbo i Serra,
Guenter Roeck, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai, Benson Leung, Yu-Hsuan Hsu, alsa-devel
Support setting bclk ratio from machine drivers.
Signed-off-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
---
sound/soc/codecs/cros_ec_codec.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c
index 6a24f570c5e86f..d3dc42aa682565 100644
--- a/sound/soc/codecs/cros_ec_codec.c
+++ b/sound/soc/codecs/cros_ec_codec.c
@@ -45,6 +45,9 @@ struct cros_ec_codec_priv {
/* DMIC */
atomic_t dmic_probed;
+ /* I2S_RX */
+ uint32_t i2s_rx_bclk_ratio;
+
/* WoV */
bool wov_enabled;
uint8_t *wov_audio_shm_p;
@@ -259,6 +262,7 @@ static int i2s_rx_hw_params(struct snd_pcm_substream *substream,
snd_soc_component_get_drvdata(component);
struct ec_param_ec_codec_i2s_rx p;
enum ec_codec_i2s_rx_sample_depth depth;
+ uint32_t bclk;
int ret;
if (params_rate(params) != 48000)
@@ -284,15 +288,29 @@ static int i2s_rx_hw_params(struct snd_pcm_substream *substream,
if (ret < 0)
return ret;
- dev_dbg(component->dev, "set bclk to %u\n",
- snd_soc_params_to_bclk(params));
+ if (priv->i2s_rx_bclk_ratio)
+ bclk = params_rate(params) * priv->i2s_rx_bclk_ratio;
+ else
+ bclk = snd_soc_params_to_bclk(params);
+
+ dev_dbg(component->dev, "set bclk to %u\n", bclk);
p.cmd = EC_CODEC_I2S_RX_SET_BCLK;
- p.set_bclk_param.bclk = snd_soc_params_to_bclk(params);
+ p.set_bclk_param.bclk = bclk;
return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX,
(uint8_t *)&p, sizeof(p), NULL, 0);
}
+static int i2s_rx_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
+{
+ struct snd_soc_component *component = dai->component;
+ struct cros_ec_codec_priv *priv =
+ snd_soc_component_get_drvdata(component);
+
+ priv->i2s_rx_bclk_ratio = ratio;
+ return 0;
+}
+
static int i2s_rx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{
struct snd_soc_component *component = dai->component;
@@ -340,6 +358,7 @@ static int i2s_rx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static const struct snd_soc_dai_ops i2s_rx_dai_ops = {
.hw_params = i2s_rx_hw_params,
.set_fmt = i2s_rx_set_fmt,
+ .set_bclk_ratio = i2s_rx_set_bclk_ratio,
};
static int i2s_rx_event(struct snd_soc_dapm_widget *w,
--
2.25.0.341.g760bfbb309-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] ASoC: cros_ec_codec: Support setting bclk ratio
2020-01-25 16:29 [PATCH v2] ASoC: cros_ec_codec: Support setting bclk ratio Yu-Hsuan Hsu
@ 2020-01-26 10:25 ` Tzung-Bi Shih
0 siblings, 0 replies; 2+ messages in thread
From: Tzung-Bi Shih @ 2020-01-26 10:25 UTC (permalink / raw)
To: Yu-Hsuan Hsu
Cc: Linux Kernel Mailing List, Cheng-Yi Chiang, Tzung-Bi Shih,
Enric Balletbo i Serra, Guenter Roeck, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Benson Leung, ALSA development
On Sun, Jan 26, 2020 at 12:29 AM Yu-Hsuan Hsu <yuhsuan@chromium.org> wrote:
>
> Support setting bclk ratio from machine drivers.
>
> Signed-off-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Reviewed-by: Tzung-Bi Shih <tzungbi@google.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-26 10:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-25 16:29 [PATCH v2] ASoC: cros_ec_codec: Support setting bclk ratio Yu-Hsuan Hsu
2020-01-26 10:25 ` Tzung-Bi Shih
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).