From: Sebastian Reichel <sebastian.reichel@collabora.com> To: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>, Support Opensource <support.opensource@diasemi.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Sebastian Reichel <sebastian.reichel@collabora.com> Subject: [PATCHv2 4/6] ASoC: da7213: Move set_sysclk to codec level Date: Wed, 20 Nov 2019 16:24:04 +0100 [thread overview] Message-ID: <20191120152406.2744-5-sebastian.reichel@collabora.com> (raw) In-Reply-To: <20191120152406.2744-1-sebastian.reichel@collabora.com> Move set_sysclk function to component level, so that it can be used at both component and DAI level. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> --- sound/soc/codecs/da7213.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 0359249118d0..9686948b16ea 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1343,10 +1343,10 @@ static int da7213_mute(struct snd_soc_dai *dai, int mute) #define DA7213_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, - int clk_id, unsigned int freq, int dir) +static int da7213_set_component_sysclk(struct snd_soc_component *component, + int clk_id, int source, + unsigned int freq, int dir) { - struct snd_soc_component *component = codec_dai->component; struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); int ret = 0; @@ -1354,7 +1354,7 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, return 0; if (((freq < 5000000) && (freq != 32768)) || (freq > 54000000)) { - dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", + dev_err(component->dev, "Unsupported MCLK value %d\n", freq); return -EINVAL; } @@ -1370,7 +1370,7 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, DA7213_PLL_MCLK_SQR_EN); break; default: - dev_err(codec_dai->dev, "Unknown clock source %d\n", clk_id); + dev_err(component->dev, "Unknown clock source %d\n", clk_id); return -EINVAL; } @@ -1380,7 +1380,7 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, freq = clk_round_rate(da7213->mclk, freq); ret = clk_set_rate(da7213->mclk, freq); if (ret) { - dev_err(codec_dai->dev, "Failed to set clock rate %d\n", + dev_err(component->dev, "Failed to set clock rate %d\n", freq); return ret; } @@ -1507,7 +1507,6 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, static const struct snd_soc_dai_ops da7213_dai_ops = { .hw_params = da7213_hw_params, .set_fmt = da7213_set_dai_fmt, - .set_sysclk = da7213_set_dai_sysclk, .set_pll = da7213_set_dai_pll, .digital_mute = da7213_mute, }; @@ -1845,6 +1844,7 @@ static const struct snd_soc_component_driver soc_component_dev_da7213 = { .num_dapm_widgets = ARRAY_SIZE(da7213_dapm_widgets), .dapm_routes = da7213_audio_map, .num_dapm_routes = ARRAY_SIZE(da7213_audio_map), + .set_sysclk = da7213_set_component_sysclk, .idle_bias_on = 1, .use_pmdown_time = 1, .endianness = 1, -- 2.24.0
WARNING: multiple messages have this Message-ID (diff)
From: Sebastian Reichel <sebastian.reichel@collabora.com> To: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>, Support Opensource <support.opensource@diasemi.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.com>, linux-kernel@vger.kernel.org, Sebastian Reichel <sebastian.reichel@collabora.com>, kernel@collabora.com Subject: [alsa-devel] [PATCHv2 4/6] ASoC: da7213: Move set_sysclk to codec level Date: Wed, 20 Nov 2019 16:24:04 +0100 [thread overview] Message-ID: <20191120152406.2744-5-sebastian.reichel@collabora.com> (raw) In-Reply-To: <20191120152406.2744-1-sebastian.reichel@collabora.com> Move set_sysclk function to component level, so that it can be used at both component and DAI level. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> --- sound/soc/codecs/da7213.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 0359249118d0..9686948b16ea 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1343,10 +1343,10 @@ static int da7213_mute(struct snd_soc_dai *dai, int mute) #define DA7213_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, - int clk_id, unsigned int freq, int dir) +static int da7213_set_component_sysclk(struct snd_soc_component *component, + int clk_id, int source, + unsigned int freq, int dir) { - struct snd_soc_component *component = codec_dai->component; struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); int ret = 0; @@ -1354,7 +1354,7 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, return 0; if (((freq < 5000000) && (freq != 32768)) || (freq > 54000000)) { - dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", + dev_err(component->dev, "Unsupported MCLK value %d\n", freq); return -EINVAL; } @@ -1370,7 +1370,7 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, DA7213_PLL_MCLK_SQR_EN); break; default: - dev_err(codec_dai->dev, "Unknown clock source %d\n", clk_id); + dev_err(component->dev, "Unknown clock source %d\n", clk_id); return -EINVAL; } @@ -1380,7 +1380,7 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, freq = clk_round_rate(da7213->mclk, freq); ret = clk_set_rate(da7213->mclk, freq); if (ret) { - dev_err(codec_dai->dev, "Failed to set clock rate %d\n", + dev_err(component->dev, "Failed to set clock rate %d\n", freq); return ret; } @@ -1507,7 +1507,6 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, static const struct snd_soc_dai_ops da7213_dai_ops = { .hw_params = da7213_hw_params, .set_fmt = da7213_set_dai_fmt, - .set_sysclk = da7213_set_dai_sysclk, .set_pll = da7213_set_dai_pll, .digital_mute = da7213_mute, }; @@ -1845,6 +1844,7 @@ static const struct snd_soc_component_driver soc_component_dev_da7213 = { .num_dapm_widgets = ARRAY_SIZE(da7213_dapm_widgets), .dapm_routes = da7213_audio_map, .num_dapm_routes = ARRAY_SIZE(da7213_audio_map), + .set_sysclk = da7213_set_component_sysclk, .idle_bias_on = 1, .use_pmdown_time = 1, .endianness = 1, -- 2.24.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-11-20 15:24 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-20 15:24 [PATCHv2 0/6] ASoC: da7213: support for usage with simple-card Sebastian Reichel 2019-11-20 15:24 ` [alsa-devel] " Sebastian Reichel 2019-11-20 15:24 ` [PATCHv2 1/6] ASoC: da7213: Add da7212 DT compatible Sebastian Reichel 2019-11-20 15:24 ` [alsa-devel] " Sebastian Reichel 2019-11-21 20:10 ` Adam Thomson 2019-11-21 20:10 ` [alsa-devel] " Adam Thomson 2019-11-22 17:20 ` Sebastian Reichel 2019-11-22 17:20 ` [alsa-devel] " Sebastian Reichel 2019-11-20 15:24 ` [PATCHv2 2/6] ASoC: da7213: Add regulator support Sebastian Reichel 2019-11-20 15:24 ` [alsa-devel] " Sebastian Reichel 2019-11-21 21:15 ` Adam Thomson 2019-11-21 21:15 ` [alsa-devel] " Adam Thomson 2019-11-22 17:09 ` Sebastian Reichel 2019-11-22 17:09 ` [alsa-devel] " Sebastian Reichel 2019-11-26 17:02 ` Adam Thomson 2019-11-26 17:02 ` [alsa-devel] " Adam Thomson 2019-11-20 15:24 ` [PATCHv2 3/6] ASoC: da7213: Provide selectable option Sebastian Reichel 2019-11-20 15:24 ` [alsa-devel] " Sebastian Reichel 2019-11-26 17:05 ` Adam Thomson 2019-11-26 17:05 ` [alsa-devel] " Adam Thomson 2019-11-20 15:24 ` Sebastian Reichel [this message] 2019-11-20 15:24 ` [alsa-devel] [PATCHv2 4/6] ASoC: da7213: Move set_sysclk to codec level Sebastian Reichel 2019-11-26 17:09 ` Adam Thomson 2019-11-26 17:09 ` [alsa-devel] " Adam Thomson 2019-11-20 15:24 ` [PATCHv2 5/6] ASoC: da7213: Move set_pll " Sebastian Reichel 2019-11-20 15:24 ` [alsa-devel] " Sebastian Reichel 2019-11-26 17:10 ` Adam Thomson 2019-11-26 17:10 ` [alsa-devel] " Adam Thomson 2019-11-20 15:24 ` [PATCHv2 6/6] ASoC: da7213: Add default clock handling Sebastian Reichel 2019-11-20 15:24 ` [alsa-devel] " Sebastian Reichel 2019-11-21 21:49 ` Adam Thomson 2019-11-21 21:49 ` [alsa-devel] " Adam Thomson 2019-11-26 16:55 ` Adam Thomson 2019-11-26 16:55 ` [alsa-devel] " Adam Thomson 2019-11-26 17:08 ` Mark Brown 2019-11-26 17:08 ` [alsa-devel] " Mark Brown 2019-11-26 17:39 ` Adam Thomson 2019-11-26 17:39 ` [alsa-devel] " Adam Thomson 2019-11-26 17:50 ` Mark Brown 2019-11-26 17:50 ` [alsa-devel] " Mark Brown 2019-11-27 11:32 ` Adam Thomson 2019-11-27 11:32 ` [alsa-devel] " Adam Thomson 2019-11-27 12:33 ` Mark Brown 2019-11-27 12:33 ` [alsa-devel] " Mark Brown 2019-11-27 13:42 ` Adam Thomson 2019-11-27 13:42 ` [alsa-devel] " Adam Thomson 2019-11-27 15:40 ` Mark Brown 2019-11-27 15:40 ` [alsa-devel] " Mark Brown 2019-11-27 16:33 ` Adam Thomson 2019-11-27 16:33 ` [alsa-devel] " Adam Thomson 2019-11-27 16:41 ` Mark Brown 2019-11-27 16:41 ` [alsa-devel] " Mark Brown 2019-11-27 18:10 ` Adam Thomson 2019-11-27 18:10 ` [alsa-devel] " Adam Thomson 2019-11-28 13:13 ` Mark Brown 2019-11-28 13:13 ` [alsa-devel] " 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=20191120152406.2744-5-sebastian.reichel@collabora.com \ --to=sebastian.reichel@collabora.com \ --cc=Adam.Thomson.Opensource@diasemi.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=kernel@collabora.com \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=support.opensource@diasemi.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: 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.