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

[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

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

19 Apr '19

Hi > > > On Thu, Apr 18, 2019 at 09:37:06AM +0000, S.j. Wang wrote: > > > > > And this is according to IMX6DQRM: > > > > > Limited support for the case when output sampling rates is > > > > > between 8kHz and 30kHz. The limitation is the supported ratio > > > > > (Fsin/Fsout) range as between 1/24 to 8 > > > > > > > > > > This should cover your 8.125 condition already, even if having > > > > > an outrate range between [8KHz, 30KHz] check, since an outrate > > > > > above 30KHz will not have an inrate bigger than 8.125 times of > > > > > it, given the maximum input rate is 192KHz. > > > > > > > > > > So I think that we can just drop that 8.125 condition from your > > > > > change and there's no need to error out any more. > > > > > > > > > No, if outrate=8kHz, inrate > 88.2kHz, these cases are not supported. > > > > This is not covered by > > > > > > > > if ((outrate > 8000 && outrate < 30000) && > > > > (outrate/inrate > 24 || inrate/outrate > 8)) { > > > > > > Good catch. The range should be [8KHz, 30KHz] vs. (8KHz, 32KHz) in > > > the code. Then I think the fix should be at both lines: > > > > > > - if ((outrate > 8000 && outrate < 30000) && > > > - (outrate/inrate > 24 || inrate/outrate > 8)) { > > > + if ((outrate >= 8000 && outrate =< 30000) && > > > + (outrate > 24 * inrate || inrate > 8 * outrate)) { > > > > > > Overall, I think we should fix this instead of adding an extra one, > > > since it is very likely saying the same thing. > > > > Actually if outrate < 8kHz, there will be issue too. > > Here is the thing, the RM doesn't explicitly state that ASRC can support a > lower output sample rate than 8KHz. And I actually had a concern when > reviewing your PATCH-2, as the table of supported output sample rate no > longer matches RM. > > If you've verified a lower output sample rate working solid with the > process_option function, that means our driver can go beyond the > limitation mentioned in the RM, then I believe [8KHz, 32KHz] should be > updated too -- that says we can do: > - if ((outrate > 8000 && outrate < 30000) && > - (outrate/inrate > 24 || inrate/outrate > 8)) { > + if ((outrate >= 5512 && outrate =< 30000) && > + (outrate > 24 * inrate || inrate > 8 * outrate)) { > > Actually "ourate > 24 * inrate" is kind of pointless for range [5KHz, 32KHz] > but we can keep it since it matches RM. Ok, will send v4. Best regards Wang shengjiu

1 0

[alsa-devel] [PATCH v3][RFC] ASoC: modern style CPU
by Kuninori Morimoto 19 Apr '19

19 Apr '19

Hi Mark, Pierre-Louis Sorry for my random posting. These are v3 of RFC of modern style CPU support. I brush-uped macro by using __VA_ARGS__. v2 -> v3 - use __VA_ARGS__ We can use same macro for both With / Without Platform v1 -> v2 - Macro naming fixup - no more _CC, _CCP - has manual CPU/Codec/Platform setup Thank you for your help !! Best regards --- Kuninori Morimoto

1 3

[alsa-devel] No sound output on Zen AIO 27 Z272SD_Z272SD
by Kai-Heng Feng 19 Apr '19

19 Apr '19

Hi, Zen AIO 27 Z272SD_Z272SD doesn’t have sound output [1]. We’ve tried "model=alc256-asus-aio” but it doesn’t work. Seems like this platform needs something different than ALC256_FIXUP_ASUS_AIO_GPIO2. [1] https://bugs.launchpad.net/bugs/1821936 Kai-Heng

4 8

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

18 Apr '19

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); + + regcache_cache_only(esai_priv->regmap, true); + ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE); if (ret) dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret); @@ -954,6 +910,13 @@ static int fsl_esai_probe(struct platform_device *pdev) return ret; } +static int fsl_esai_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + + return 0; +} + static const struct of_device_id fsl_esai_dt_ids[] = { { .compatible = "fsl,imx35-esai", }, { .compatible = "fsl,vf610-esai", }, @@ -961,22 +924,35 @@ static int fsl_esai_probe(struct platform_device *pdev) }; MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids); -#ifdef CONFIG_PM_SLEEP -static int fsl_esai_suspend(struct device *dev) -{ - struct fsl_esai *esai = dev_get_drvdata(dev); - - regcache_cache_only(esai->regmap, true); - regcache_mark_dirty(esai->regmap); - - return 0; -} - -static int fsl_esai_resume(struct device *dev) +#ifdef CONFIG_PM +static int fsl_esai_runtime_resume(struct device *dev) { struct fsl_esai *esai = dev_get_drvdata(dev); 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->coreclk); + if (ret) + return ret; + if (!IS_ERR(esai->spbaclk)) { + ret = clk_prepare_enable(esai->spbaclk); + if (ret) + goto err_spbaclk; + } + if (!IS_ERR(esai->extalclk)) { + ret = clk_prepare_enable(esai->extalclk); + if (ret) + goto err_extalclk; + } + if (!IS_ERR(esai->fsysclk)) { + ret = clk_prepare_enable(esai->fsysclk); + if (ret) + goto err_fsysclk; + } + regcache_cache_only(esai->regmap, false); /* FIFO reset for safety */ @@ -987,22 +963,59 @@ static int fsl_esai_resume(struct device *dev) ret = regcache_sync(esai->regmap); if (ret) - return ret; + goto err_regcache_sync; /* FIFO reset done */ regmap_update_bits(esai->regmap, REG_ESAI_TFCR, ESAI_xFCR_xFR, 0); regmap_update_bits(esai->regmap, REG_ESAI_RFCR, ESAI_xFCR_xFR, 0); return 0; + +err_regcache_sync: + if (!IS_ERR(esai->fsysclk)) + clk_disable_unprepare(esai->fsysclk); +err_fsysclk: + if (!IS_ERR(esai->extalclk)) + clk_disable_unprepare(esai->extalclk); +err_extalclk: + if (!IS_ERR(esai->spbaclk)) + clk_disable_unprepare(esai->spbaclk); +err_spbaclk: + clk_disable_unprepare(esai->coreclk); + + return ret; } -#endif /* CONFIG_PM_SLEEP */ + +static int fsl_esai_runtime_suspend(struct device *dev) +{ + struct fsl_esai *esai = dev_get_drvdata(dev); + + regcache_cache_only(esai->regmap, true); + regcache_mark_dirty(esai->regmap); + + if (!IS_ERR(esai->fsysclk)) + clk_disable_unprepare(esai->fsysclk); + if (!IS_ERR(esai->extalclk)) + clk_disable_unprepare(esai->extalclk); + if (!IS_ERR(esai->spbaclk)) + clk_disable_unprepare(esai->spbaclk); + clk_disable_unprepare(esai->coreclk); + + return 0; +} +#endif /* CONFIG_PM */ static const struct dev_pm_ops fsl_esai_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(fsl_esai_suspend, fsl_esai_resume) + SET_RUNTIME_PM_OPS(fsl_esai_runtime_suspend, + fsl_esai_runtime_resume, + NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; static struct platform_driver fsl_esai_driver = { .probe = fsl_esai_probe, + .remove = fsl_esai_remove, .driver = { .name = "fsl-esai-dai", .pm = &fsl_esai_pm_ops, -- 1.9.1

2 1