| Message ID | 20230913171552.92252-2-contact@jookia.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/3] ASoC: wm8782: Handle maximum audio rate at runtime | expand |
On Thu, Sep 14, 2023 at 03:15:50AM +1000, John Watts wrote: > The wm8782 supports up to 192kHz audio when pins are set correctly. > Instead of hardcoding which rates are supported enable them all > then refer to a max_rate variable at runtime. > > Signed-off-by: John Watts <contact@jookia.org> > --- > +static int wm8782_dai_hw_params(struct snd_pcm_substream *component, > + struct snd_pcm_hw_params *params, > + struct snd_soc_dai *dai) > +{ > + struct wm8782_priv *priv = > + snd_soc_component_get_drvdata(dai->component); > + > + if (params_rate(params) > priv->max_rate) > + return -EINVAL; > + > + return 0; > +} We should be setting this as a constraint in startup, rather than returning an error in hw_params. That will let user-space know the supported rates and allow it to resample if necessary. Thanks, Charles
On Thu, Sep 14, 2023 at 09:37:31AM +0000, Charles Keepax wrote: > On Thu, Sep 14, 2023 at 07:27:03PM +1000, John Watts wrote: > > On Thu, Sep 14, 2023 at 09:21:07AM +0000, Charles Keepax wrote: > > > On Thu, Sep 14, 2023 at 03:15:50AM +1000, John Watts wrote: > > > > The wm8782 supports up to 192kHz audio when pins are set correctly. > > > > Instead of hardcoding which rates are supported enable them all > > > > then refer to a max_rate variable at runtime. > > > > > > > > Signed-off-by: John Watts <contact@jookia.org> > > > > --- > > > > +static int wm8782_dai_hw_params(struct snd_pcm_substream *component, > > > > + struct snd_pcm_hw_params *params, > > > > + struct snd_soc_dai *dai) > > > > +{ > > > > + struct wm8782_priv *priv = > > > > + snd_soc_component_get_drvdata(dai->component); > > > > + > > > > + if (params_rate(params) > priv->max_rate) > > > > + return -EINVAL; > > > > + > > > > + return 0; > > > > +} > > > > > > We should be setting this as a constraint in startup, rather > > > than returning an error in hw_params. That will let user-space > > > know the supported rates and allow it to resample if necessary. > > > > How do you do this? The struct with the rate is statically defined. > > > > You can programmatically add additional constraints, commonly > this will be done from the startup callback on the DAI. See > something like arizona_startup in sound/soc/codecs/arizona.c for > an example, that enables 44.1/48k rates based on clocks but the > principle should be similar. > Although I would also imagine snd_pcm_hw_constraint_minmax is going to be more appropriate in your case. Thanks, Charles
diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c index 95ff4339d103..63ab63f3189a 100644 --- a/sound/soc/codecs/wm8782.c +++ b/sound/soc/codecs/wm8782.c @@ -23,6 +23,30 @@ #include <sound/initval.h> #include <sound/soc.h> +/* regulator power supply names */ +static const char *supply_names[] = { + "Vdda", /* analog supply, 2.7V - 3.6V */ + "Vdd", /* digital supply, 2.7V - 5.5V */ +}; + +struct wm8782_priv { + struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; + int max_rate; +}; + +static int wm8782_dai_hw_params(struct snd_pcm_substream *component, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct wm8782_priv *priv = + snd_soc_component_get_drvdata(dai->component); + + if (params_rate(params) > priv->max_rate) + return -EINVAL; + + return 0; +} + static const struct snd_soc_dapm_widget wm8782_dapm_widgets[] = { SND_SOC_DAPM_INPUT("AINL"), SND_SOC_DAPM_INPUT("AINR"), @@ -33,28 +57,22 @@ static const struct snd_soc_dapm_route wm8782_dapm_routes[] = { { "Capture", NULL, "AINR" }, }; +static const struct snd_soc_dai_ops wm8782_dai_ops = { + .hw_params = &wm8782_dai_hw_params, +}; + static struct snd_soc_dai_driver wm8782_dai = { .name = "wm8782", .capture = { .stream_name = "Capture", .channels_min = 2, .channels_max = 2, - /* For configurations with FSAMPEN=0 */ - .rates = SNDRV_PCM_RATE_8000_48000, + .rates = SNDRV_PCM_RATE_8000_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE, }, -}; - -/* regulator power supply names */ -static const char *supply_names[] = { - "Vdda", /* analog supply, 2.7V - 3.6V */ - "Vdd", /* digital supply, 2.7V - 5.5V */ -}; - -struct wm8782_priv { - struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; + .ops = &wm8782_dai_ops, }; static int wm8782_soc_probe(struct snd_soc_component *component) @@ -121,6 +139,9 @@ static int wm8782_probe(struct platform_device *pdev) if (ret < 0) return ret; + /* For configurations with FSAMPEN=0 */ + priv->max_rate = 48000; + return devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_wm8782, &wm8782_dai, 1); }
The wm8782 supports up to 192kHz audio when pins are set correctly. Instead of hardcoding which rates are supported enable them all then refer to a max_rate variable at runtime. Signed-off-by: John Watts <contact@jookia.org> --- sound/soc/codecs/wm8782.c | 45 ++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 12 deletions(-)