April 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v5 0/6] drm/bridge: sii902x: HDMI-audio support and some fixes
by Jyri Sarha 21 Apr '19

21 Apr '19

The sil,i2s-data-lanes property is still under negotiation. The question really is if there could be a generic audio i2s property to handle that. alsa_devel added to the list of recipients. Changes since v3: - Change i2s-data-lanes to sil,i2s-data-lanes The already reviewed patches are in front. Not reviewed still: - "dt-bindings: display: sii902x: Add HDMI audio bindings" - "drm/bridge: sii902x: Implement HDMI audio support" The previous round: https://patchwork.kernel.org/cover/10852643/ Jyri Sarha (5): drm/bridge: sii902x: Set output mode to HDMI or DVI according to EDID drm/bridge: sii902x: pixel clock unit is 10kHz instead of 1kHz dt-bindings: display: sii902x: Remove trailing white space dt-bindings: display: sii902x: Add HDMI audio bindings drm/bridge: sii902x: Implement HDMI audio support Tomi Valkeinen (1): drm/bridge: sii902x: add input_bus_flags .../bindings/display/bridge/sii902x.txt | 35 +- drivers/gpu/drm/bridge/sii902x.c | 478 +++++++++++++++++- 2 files changed, 505 insertions(+), 8 deletions(-) -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

4 13

Re: [alsa-devel] [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate
by S.j. Wang 20 Apr '19

20 Apr '19

Hi. > > On Fri, Apr 19, 2019 at 10:23:56AM +0000, S.j. Wang wrote: > > Unify the supported input and output rate, add the 12kHz/24kHz/128kHz > > to the support list > > > > Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> > > --- > > sound/soc/fsl/fsl_asrc.c | 32 +++++++++++++++++++------------- > > 1 file changed, 19 insertions(+), 13 deletions(-) > > > > diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index > > 2c4bbc3499db..0d06e738264a 100644 > > --- a/sound/soc/fsl/fsl_asrc.c > > +++ b/sound/soc/fsl/fsl_asrc.c > > @@ -27,13 +27,14 @@ > > dev_dbg(&asrc_priv->pdev->dev, "Pair %c: " fmt, 'A' + index, > > ##__VA_ARGS__) > > > > /* Corresponding to process_option */ -static int > > supported_input_rate[] = { > > - 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, > > - 96000, 176400, 192000, > > +static unsigned int supported_asrc_rate[] = { > > + 5512, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, > > + 64000, 88200, 96000, 128000, 176400, 192000, > > }; > > > > -static int supported_asrc_rate[] = { > > - 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, 96000, > 176400, 192000, > > +static struct snd_pcm_hw_constraint_list fsl_asrc_rate_constraints = { > > + .count = ARRAY_SIZE(supported_asrc_rate), > > + .list = supported_asrc_rate, > > }; > > > > /** > > @@ -293,11 +294,11 @@ static int fsl_asrc_config_pair(struct > fsl_asrc_pair *pair) > > ideal = config->inclk == INCLK_NONE; > > > > /* Validate input and output sample rates */ > > - for (in = 0; in < ARRAY_SIZE(supported_input_rate); in++) > > - if (inrate == supported_input_rate[in]) > > + for (in = 0; in < ARRAY_SIZE(supported_asrc_rate); in++) > > + if (inrate == supported_asrc_rate[in]) > > break; > > Not sure if we still need it upon having hw_constraint. Maybe m2m needs it? Yes. Best regards Wang shengjiu

2 1

Re: [alsa-devel] [PATCH V4 2/3] ASoC: fsl_asrc: replace the process_option table with function
by S.j. Wang 20 Apr '19

20 Apr '19

Hi > > > On Fri, Apr 19, 2019 at 10:23:53AM +0000, S.j. Wang wrote: > > > @@ -289,6 +318,12 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair > *pair) > > return -EINVAL; > > } > > > > + ret = fsl_asrc_sel_proc(inrate, outrate, &pre_proc, &post_proc); > > Since the function always return 0, I am thinking of treating this function as > a lookup function, and then moving this call right before the register > settings -- as we have already made sure that both inrate and outrate are > supported. Ok. > > > + if (ret) { > > + pair_err("No supported pre-processing options\n"); > > + return ret; > > + } > > And probably no longer need this error-out. If there's a new limitation > related to this function, I believe we can add it to the rate validation > section as we are doing now -- better to have rate validation code at one > place. > Ok. > > @@ -380,8 +415,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair > *pair) > > /* Apply configurations for pre- and post-processing */ > > Here: > - /* Apply configurations for pre- and post-processing */ > + /* Select and apply configurations for pre- and post-processing */ > + fsl_asrc_sel_proc(inrate, outrate, &pre_proc, &post_proc); > > regmap_update_bits(asrc_priv->regmap, REG_ASRCFG, > > ASRCFG_PREMODi_MASK(index) | > ASRCFG_POSTMODi_MASK(index), > > - ASRCFG_PREMOD(index, process_option[in][out][0]) | > > - ASRCFG_POSTMOD(index, process_option[in][out][1])); > > + ASRCFG_PREMOD(index, pre_proc) | > > + ASRCFG_POSTMOD(index, post_proc));

1 0

[alsa-devel] [PATCH V4 0/3] Support more sample rate in asrc
by S.j. Wang 20 Apr '19

20 Apr '19

Support more sample rate in asrc Shengjiu Wang (3): ASoC: fsl_asrc: Fix the issue about unsupported rate ASoC: fsl_asrc: replace the process_option table with function ASoC: fsl_asrc: Unify the supported input and output rate Changes in v4 - add patch to Fix the [8kHz, 30kHz] open set issue. Changes in v3 - remove FSL_ASRC_RATES - refine fsl_asrc_sel_proc according to comments Changes in v2 - add more comments in code - add commit "Unify the supported input and output rate" sound/soc/fsl/fsl_asrc.c | 113 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 77 insertions(+), 36 deletions(-) -- 1.9.1

2 7

[alsa-devel] [PATCH 00/27] ASoC: samsung: Convert to SPDX licence identifiers
by Sylwester Nawrocki 19 Apr '19

19 Apr '19

This patch set converts remaining files under sound/asoc/samsung to SPDX licence identifiers. While at it file paths are removed from the comments header in some files. If that's preferred I will squash and repost as one patch. Sylwester Nawrocki (27): ASoC: samsung: arndale: Convert to SPDX License Identifier ASoC: samsung: bells: Convert to SPDX License Identifier ASoC: samsung: dmaengine: Convert to SPDX License Indentifier ASoC: samsung: h1940_uda1380: Convert to SPDX License Identifier ASoC: samsung: i2s: Convert to SPDX License Identifier ASoC: samsung: idma: Convert to SPDX License Identifier ASoC: samsung: jive_wm8750: Convert to SPDX License Identifier ASoC: samsung: littlemill: Convert to SPDX License Identifier ASoC: samsung: lowland: Convert to SPDX License Identifier ASoC: samsung: neo1973_wm8753: Convert to SPDX License Identifier ASoC: samsung: odroid: Convert to SPDX License Identifier ASoC: samsung: pcm: Convert to SPDX License Identifier ASoC: samsung: s3c-i2s-v2: Convert to SPDX License Identifier ASoC: samsung: s3c24xx-i2s: Convert to SPDX License Identifier ASoC: samsung: rx1950_uda1380: Convert to SPDX License Identifier ASoC: samsung: s3c2412-i2s: Convert to SPDX License Identifier ASoC: samsung: s3c24xx_simtec*: Convert to SPDX License Identifier ASoC: samsung: s3c24xx_uda134x: Convert to SPDX License Identifier ASoC: samsung: smartq_wm8987: Convert to SPDX License Identifier ASoC: samsung: smdk_spdif: Convert to SPDX License Identifier ASoC: samsung: smdk_wm8580: Convert to SPDX License Identifier ASoC: samsung: smdk_wm8994*: Convert to SPDX License Identifier ASoC: samsung: snow: Convert to SPDX License Identifier ASoC: samsung: spdif: Convert to SPDX License Identifier ASoC: samsung: speyside: Convert to SPDX License Identifier ASoC: samsung: tm2_wm5110: Convert to SPDX License Identifier ASoC: samsung: tobermory: Convert to SPDX License Identifier sound/soc/samsung/arndale_rt5631.c | 17 ++++------- sound/soc/samsung/bells.c | 15 ++++------ sound/soc/samsung/dma.h | 8 ++--- sound/soc/samsung/dmaengine.c | 22 ++++---------- sound/soc/samsung/h1940_uda1380.c | 22 +++++--------- sound/soc/samsung/i2s-regs.h | 8 +---- sound/soc/samsung/i2s.h | 8 ++--- sound/soc/samsung/idma.c | 20 +++++-------- sound/soc/samsung/idma.h | 9 +----- sound/soc/samsung/jive_wm8750.c | 19 +++++------- sound/soc/samsung/littlemill.c | 15 ++++------ sound/soc/samsung/lowland.c | 15 ++++------ sound/soc/samsung/neo1973_wm8753.c | 25 +++++++--------- sound/soc/samsung/odroid.c | 10 ++----- sound/soc/samsung/pcm.c | 19 +++++------- sound/soc/samsung/pcm.h | 8 +---- sound/soc/samsung/regs-i2s-v2.h | 10 ++----- sound/soc/samsung/regs-iis.h | 7 ++--- sound/soc/samsung/rx1950_uda1380.c | 30 ++++++++----------- sound/soc/samsung/s3c-i2s-v2.c | 26 +++++++--------- sound/soc/samsung/s3c-i2s-v2.h | 11 ++----- sound/soc/samsung/s3c2412-i2s.c | 28 +++++++---------- sound/soc/samsung/s3c2412-i2s.h | 11 ++----- sound/soc/samsung/s3c24xx-i2s.c | 25 +++++++--------- sound/soc/samsung/s3c24xx-i2s.h | 6 +--- sound/soc/samsung/s3c24xx_simtec.c | 11 ++----- sound/soc/samsung/s3c24xx_simtec.h | 10 ++----- sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 ++----- .../soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 ++----- sound/soc/samsung/s3c24xx_uda134x.c | 20 +++++-------- sound/soc/samsung/smartq_wm8987.c | 21 +++++-------- sound/soc/samsung/smdk_spdif.c | 16 ++++------ sound/soc/samsung/smdk_wm8580.c | 15 +++------- sound/soc/samsung/smdk_wm8994.c | 9 +----- sound/soc/samsung/smdk_wm8994pcm.c | 16 ++++------ sound/soc/samsung/snow.c | 15 ++-------- sound/soc/samsung/spdif.c | 17 ++++------- sound/soc/samsung/spdif.h | 8 ++--- sound/soc/samsung/speyside.c | 15 ++++------ sound/soc/samsung/tm2_wm5110.c | 17 ++++------- sound/soc/samsung/tobermory.c | 15 ++++------ 41 files changed, 200 insertions(+), 421 deletions(-) -- 2.17.1

2 54

[alsa-devel] [PATCH] ASoC: pcm: save fixed-up hw_params of BE
by libin.yang＠intel.com 19 Apr '19

19 Apr '19

From: Libin Yang <libin.yang(a)intel.com> Some drivers mandate setting up hw params after resuming from system sleep. Since, the hw_params ioctl is not invoked upon resuming, the fixed-up BE dai hw params should be saved so the driver can use it in its resume sequence. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/soc/soc-pcm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index d212475..7469535 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2164,6 +2164,10 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) } } + /* copy the fixed-up hw params for BE dai */ + memcpy(&be->dpcm[stream].hw_params, &dpcm->hw_params, + sizeof(struct snd_pcm_hw_params)); + /* only allow hw_params() if no connected FEs are running */ if (!snd_soc_dpcm_can_be_params(fe, be, stream)) continue; -- 2.7.4

3 2

[alsa-devel] Applied "ASoC: codec: hdac_hdmi add device_link to card device" to the asoc tree
by Mark Brown 19 Apr '19

19 Apr '19

The patch ASoC: codec: hdac_hdmi add device_link to card device has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 01c8327667c249818d3712c3e25c7ad2aca7f389 Mon Sep 17 00:00:00 2001 From: Libin Yang <libin.yang(a)intel.com> Date: Sat, 13 Apr 2019 21:18:12 +0800 Subject: [PATCH] ASoC: codec: hdac_hdmi add device_link to card device In resume from S3, HDAC HDMI codec driver dapm event callback may be operated before HDMI codec driver turns on the display audio power domain because of the contest between display driver and hdmi codec driver. This patch adds the device_link between soc card device (consumer) and hdmi codec device (supplier) to make sure the sequence is always correct. Signed-off-by: Libin Yang <libin.yang(a)intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: stable(a)vger.kernel.org --- sound/soc/codecs/hdac_hdmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 5eeb0fe836a9..4de1fbfa8827 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1854,6 +1854,17 @@ static int hdmi_codec_probe(struct snd_soc_component *component) /* Imp: Store the card pointer in hda_codec */ hdmi->card = dapm->card->snd_card; + /* + * Setup a device_link between card device and HDMI codec device. + * The card device is the consumer and the HDMI codec device is + * the supplier. With this setting, we can make sure that the audio + * domain in display power will be always turned on before operating + * on the HDMI audio codec registers. + * Let's use the flag DL_FLAG_AUTOREMOVE_CONSUMER. This can make + * sure the device link is freed when the machine driver is removed. + */ + device_link_add(component->card->dev, &hdev->dev, DL_FLAG_RPM_ACTIVE | + DL_FLAG_AUTOREMOVE_CONSUMER); /* * hdac_device core already sets the state to active and calls * get_noresume. So enable runtime and set the device to suspend. -- 2.20.1

1 0

[alsa-devel] [PATCH -next] ASoC: Intel: Haswell: Remove set but not used variable 'stage_type'
by Yue Haibing 19 Apr '19

19 Apr '19

From: YueHaibing <yuehaibing(a)huawei.com> Fixes gcc '-Wunused-but-set-variable' warning: sound/soc/intel/haswell/sst-haswell-ipc.c: In function 'hsw_stream_message': sound/soc/intel/haswell/sst-haswell-ipc.c:669:29: warning: variable 'stage_type' set but not used [-Wunused-but-set-variable] It is never used since introduction in commit ba57f68235cf ("ASoC: Intel: create haswell folder and move haswell platform files in") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 31fcdf12..4d3de99 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -672,7 +672,6 @@ static int hsw_stream_message(struct sst_hsw *hsw, u32 header) stream_msg = msg_get_stream_type(header); stream_id = msg_get_stream_id(header); - stage_type = msg_get_stage_type(header); stream = get_stream_by_id(hsw, stream_id); if (stream == NULL) -- 2.7.4

4 5

[alsa-devel] [PATCH V2] ASoC: fsl_esai: Add pm runtime function
by S.j. Wang 19 Apr '19

19 Apr '19

Hi > > > Add pm runtime support and move clock handling there. > fsl_esai_suspend is replaced by pm_runtime_force_suspend. > fsl_esai_resume is replaced by pm_runtime_force_resume. > > Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> > --- > Changes in v2 > -refine the commit comments. > -move regcache_mark_dirty to runtime suspend. > > sound/soc/fsl/fsl_esai.c | 141 ++++++++++++++++++++++++++-------------------- > - > 1 file changed, 77 insertions(+), 64 deletions(-) > > diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index > bad0dfed6b68..10d2210c91ef 100644 > --- a/sound/soc/fsl/fsl_esai.c > +++ b/sound/soc/fsl/fsl_esai.c > @@ -9,6 +9,7 @@ > #include <linux/module.h> > #include <linux/of_irq.h> > #include <linux/of_platform.h> > +#include <linux/pm_runtime.h> > #include <sound/dmaengine_pcm.h> > #include <sound/pcm_params.h> > > @@ -466,30 +467,6 @@ static int fsl_esai_startup(struct > snd_pcm_substream *substream, > struct snd_soc_dai *dai) { > struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); > - int ret; > - > - /* > - * Some platforms might use the same bit to gate all three or two of > - * clocks, so keep all clocks open/close at the same time for safety > - */ > - ret = clk_prepare_enable(esai_priv->coreclk); > - if (ret) > - return ret; > - if (!IS_ERR(esai_priv->spbaclk)) { > - ret = clk_prepare_enable(esai_priv->spbaclk); > - if (ret) > - goto err_spbaclk; > - } > - if (!IS_ERR(esai_priv->extalclk)) { > - ret = clk_prepare_enable(esai_priv->extalclk); > - if (ret) > - goto err_extalck; > - } > - if (!IS_ERR(esai_priv->fsysclk)) { > - ret = clk_prepare_enable(esai_priv->fsysclk); > - if (ret) > - goto err_fsysclk; > - } > > if (!dai->active) { > /* Set synchronous mode */ @@ -506,16 +483,6 @@ static int > fsl_esai_startup(struct snd_pcm_substream *substream, > > return 0; > > -err_fsysclk: > - if (!IS_ERR(esai_priv->extalclk)) > - clk_disable_unprepare(esai_priv->extalclk); > -err_extalck: > - if (!IS_ERR(esai_priv->spbaclk)) > - clk_disable_unprepare(esai_priv->spbaclk); > -err_spbaclk: > - clk_disable_unprepare(esai_priv->coreclk); > - > - return ret; > } > > static int fsl_esai_hw_params(struct snd_pcm_substream *substream, @@ > -576,20 +543,6 @@ static int fsl_esai_hw_params(struct > snd_pcm_substream *substream, > return 0; > } > > -static void fsl_esai_shutdown(struct snd_pcm_substream *substream, > - struct snd_soc_dai *dai) > -{ > - struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); > - > - if (!IS_ERR(esai_priv->fsysclk)) > - clk_disable_unprepare(esai_priv->fsysclk); > - if (!IS_ERR(esai_priv->extalclk)) > - clk_disable_unprepare(esai_priv->extalclk); > - if (!IS_ERR(esai_priv->spbaclk)) > - clk_disable_unprepare(esai_priv->spbaclk); > - clk_disable_unprepare(esai_priv->coreclk); > -} > - > static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, > struct snd_soc_dai *dai) { @@ -658,7 +611,6 @@ static int > fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, > > static const struct snd_soc_dai_ops fsl_esai_dai_ops = { > .startup = fsl_esai_startup, > - .shutdown = fsl_esai_shutdown, > .trigger = fsl_esai_trigger, > .hw_params = fsl_esai_hw_params, > .set_sysclk = fsl_esai_set_dai_sysclk, @@ -947,6 +899,10 @@ static int > fsl_esai_probe(struct platform_device *pdev) > return ret; > } > > + pm_runtime_enable(&pdev->dev); > + I just have a question, do I need to add pm_runtime_idle(&pdev->dev)? Best regards Wang shengjiu

2 1

[alsa-devel] [PATCH v2] ASoC: codec: hdac_hdmi add device_link to card device
by libin.yang＠intel.com 19 Apr '19

19 Apr '19

From: Libin Yang <libin.yang(a)intel.com> In resume from S3, HDAC HDMI codec driver dapm event callback may be operated before HDMI codec driver turns on the display audio power domain because of the contest between display driver and hdmi codec driver. This patch adds the device_link between soc card device (consumer) and hdmi codec device (supplier) to make sure the sequence is always correct. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 5eeb0fe..4de1fbf 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1855,6 +1855,17 @@ static int hdmi_codec_probe(struct snd_soc_component *component) hdmi->card = dapm->card->snd_card; /* + * Setup a device_link between card device and HDMI codec device. + * The card device is the consumer and the HDMI codec device is + * the supplier. With this setting, we can make sure that the audio + * domain in display power will be always turned on before operating + * on the HDMI audio codec registers. + * Let's use the flag DL_FLAG_AUTOREMOVE_CONSUMER. This can make + * sure the device link is freed when the machine driver is removed. + */ + device_link_add(component->card->dev, &hdev->dev, DL_FLAG_RPM_ACTIVE | + DL_FLAG_AUTOREMOVE_CONSUMER); + /* * hdac_device core already sets the state to active and calls * get_noresume. So enable runtime and set the device to suspend. */ -- 2.7.4

4 5