| Message ID | 20191120152406.2744-6-sebastian.reichel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: da7213: support for usage with simple-card | expand |
On 20 November 2019 15:24, Sebastian Reichel wrote: > Move set_pll 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> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > --- > sound/soc/codecs/da7213.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c > index 9686948b16ea..3e6ad996741b 100644 > --- a/sound/soc/codecs/da7213.c > +++ b/sound/soc/codecs/da7213.c > @@ -1392,10 +1392,10 @@ static int da7213_set_component_sysclk(struct > snd_soc_component *component, > } > > /* Supported PLL input frequencies are 32KHz, 5MHz - 54MHz. */ > -static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, > - int source, unsigned int fref, unsigned int fout) > +static int da7213_set_component_pll(struct snd_soc_component *component, > + int pll_id, int source, > + unsigned int fref, unsigned int fout) > { > - struct snd_soc_component *component = codec_dai->component; > struct da7213_priv *da7213 = > snd_soc_component_get_drvdata(component); > > u8 pll_ctrl, indiv_bits, indiv; > @@ -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_pll = da7213_set_dai_pll, > .digital_mute = da7213_mute, > }; > > @@ -1845,6 +1844,7 @@ static const struct snd_soc_component_driver > soc_component_dev_da7213 = { > .dapm_routes = da7213_audio_map, > .num_dapm_routes = ARRAY_SIZE(da7213_audio_map), > .set_sysclk = da7213_set_component_sysclk, > + .set_pll = da7213_set_component_pll, > .idle_bias_on = 1, > .use_pmdown_time = 1, > .endianness = 1, > -- > 2.24.0
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 9686948b16ea..3e6ad996741b 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1392,10 +1392,10 @@ static int da7213_set_component_sysclk(struct snd_soc_component *component, } /* Supported PLL input frequencies are 32KHz, 5MHz - 54MHz. */ -static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, - int source, unsigned int fref, unsigned int fout) +static int da7213_set_component_pll(struct snd_soc_component *component, + int pll_id, int source, + unsigned int fref, unsigned int fout) { - struct snd_soc_component *component = codec_dai->component; struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); u8 pll_ctrl, indiv_bits, indiv; @@ -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_pll = da7213_set_dai_pll, .digital_mute = da7213_mute, }; @@ -1845,6 +1844,7 @@ static const struct snd_soc_component_driver soc_component_dev_da7213 = { .dapm_routes = da7213_audio_map, .num_dapm_routes = ARRAY_SIZE(da7213_audio_map), .set_sysclk = da7213_set_component_sysclk, + .set_pll = da7213_set_component_pll, .idle_bias_on = 1, .use_pmdown_time = 1, .endianness = 1,
Move set_pll 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)