Unverified Commit 9bb93a40 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: cleanup DAI/Component activity" from Kuninori Morimoto... 

Merge series "ASoC: cleanup DAI/Component activity" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Hi Mark

These are v3 of DAI/Component activity cleanup.

This patch-set exchanges soc-dapm.c :: snd_soc_dai_link_event_xxx()
behavior which updates dai->active but not cares other actives.
But I think original code was wrong.
So, I believe these works correctly, but maybe need some tests or deep review.

v1 -> v2
	- function naming "activity" -> "active"

v2 -> v3
	- macro -> inline function
	- added Reviewed-by from Ranjani, Acked-by from Peter

Link: https://lore.kernel.org/r/875zd39frp.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87blmq9alx.wl-kuninori.morimoto.gx@renesas.com

Kuninori Morimoto (21):
  ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro
  ASoC: soc-dai: add snd_soc_dai_action()
  ASoC: soc-dapm: use snd_soc_dai_activate()/deactivate()
  ASoC: soc-dai: add snd_soc_dai_active()
  ASoC: soc-component: add snd_soc_component_active()
  ASoC: soc-dai: add snd_soc_dai_stream_active()
  ASoC: use snd_soc_xxx_active()
  ASoC: atomel: use snd_soc_xxx_active()
  ASoC: bcm: use snd_soc_xxx_active()
  ASoC: cirrus: use snd_soc_xxx_active()
  ASoC: codecs: use snd_soc_xxx_active()
  ASoC: fsl: use snd_soc_xxx_active()
  ASoC: intel: use snd_soc_xxx_active()
  ASoC: jz4740: use snd_soc_xxx_active()
  ASoC: mediatek: use snd_soc_xxx_active()
  ASoC: meson: use snd_soc_xxx_active()
  ASoC: pxa: use snd_soc_xxx_active()
  ASoC: ti: use snd_soc_xxx_active()
  ASoC: uniphier: use snd_soc_xxx_active()
  ASoC: dwc: use snd_soc_xxx_active()
  ASoC: cleanup dai / component active code

 include/sound/soc-component.h                |  6 +-
 include/sound/soc-dai.h                      | 21 +++++-
 include/sound/soc.h                          | 15 ++++-
 sound/soc/atmel/atmel_ssc_dai.c              |  4 +-
 sound/soc/bcm/bcm2835-i2s.c                  |  6 +-
 sound/soc/bcm/cygnus-ssp.c                   |  4 +-
 sound/soc/cirrus/ep93xx-i2s.c                |  4 +-
 sound/soc/codecs/adav80x.c                   |  4 +-
 sound/soc/codecs/arizona.c                   |  2 +-
 sound/soc/codecs/cs4271.c                    |  4 +-
 sound/soc/codecs/madera.c                    |  2 +-
 sound/soc/codecs/max98090.c                  |  6 +-
 sound/soc/codecs/tlv320aic23.c               |  2 +-
 sound/soc/codecs/tlv320dac33.c               |  2 +-
 sound/soc/codecs/uda1380.c                   |  2 +-
 sound/soc/codecs/wl1273.c                    |  2 +-
 sound/soc/codecs/wm8711.c                    |  2 +-
 sound/soc/codecs/wm8753.c                    |  4 +-
 sound/soc/dwc/dwc-i2s.c                      |  2 +-
 sound/soc/fsl/fsl_esai.c                     |  2 +-
 sound/soc/fsl/fsl_spdif.c                    |  4 +-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c | 14 ++--
 sound/soc/jz4740/jz4740-i2s.c                |  8 +--
 sound/soc/mediatek/mt8173/mt8173-afe-pcm.c   |  8 +--
 sound/soc/meson/axg-tdm-interface.c          |  2 +-
 sound/soc/pxa/pxa-ssp.c                      |  8 +--
 sound/soc/pxa/pxa2xx-i2s.c                   |  2 +-
 sound/soc/soc-compress.c                     |  4 +-
 sound/soc/soc-core.c                         | 11 +--
 sound/soc/soc-dai.c                          | 23 +++++++
 sound/soc/soc-dapm.c                         |  8 +--
 sound/soc/soc-pcm.c                          | 70 +++++++-------------
 sound/soc/ti/davinci-mcasp.c                 |  2 +-
 sound/soc/ti/omap-dmic.c                     |  4 +-
 sound/soc/ti/omap-mcbsp.c                    |  4 +-
 sound/soc/ti/omap-mcpdm.c                    |  8 +--
 sound/soc/uniphier/aio-cpu.c                 |  4 +-
 37 files changed, 155 insertions(+), 125 deletions(-)

--
2.17.1
parents a1c3ec70 0812a08a

include/sound/soc-component.h

+3 −3
Original line number Diff line number Diff line
@@ -389,10 +389,10 @@ static inline void *snd_soc_component_get_drvdata(struct snd_soc_component *c) 
	return dev_get_drvdata(c->dev);

}



static inline bool snd_soc_component_is_active(

	struct snd_soc_component *component)

static inline unsigned int

snd_soc_component_active(struct snd_soc_component *component)

{

	return component->active != 0;

	return component->active;

}



/* component pin */

include/sound/soc-dai.h

+19 −2
Original line number Diff line number Diff line
@@ -161,6 +161,19 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai); 
int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int num);

bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);

void snd_soc_dai_action(struct snd_soc_dai *dai,

			int stream, int action);

static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,

					int stream)

{

	snd_soc_dai_action(dai, stream,  1);

}

static inline void snd_soc_dai_deactivate(struct snd_soc_dai *dai,

					  int stream)

{

	snd_soc_dai_action(dai, stream, -1);

}

int snd_soc_dai_active(struct snd_soc_dai *dai);



int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order);

int snd_soc_pcm_dai_remove(struct snd_soc_pcm_runtime *rtd, int order);
@@ -351,8 +364,6 @@ struct snd_soc_dai { 
	/* DAI runtime info */

	unsigned int stream_active[SNDRV_PCM_STREAM_LAST + 1]; /* usage count */



	unsigned int active;



	struct snd_soc_dapm_widget *playback_widget;

	struct snd_soc_dapm_widget *capture_widget;
@@ -468,4 +479,10 @@ static inline void *snd_soc_dai_get_sdw_stream(struct snd_soc_dai *dai, 
		return ERR_PTR(-ENOTSUPP);

}



static inline unsigned int

snd_soc_dai_stream_active(struct snd_soc_dai *dai, int stream)

{

	return dai->stream_active[stream];

}



#endif

include/sound/soc.h

+13 −2
Original line number Diff line number Diff line
@@ -468,8 +468,19 @@ struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card, 
				struct snd_soc_dai_link *dai_link);



bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd);

void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);

void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);



void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,

			    int stream, int action);

static inline void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd,

				     int stream)

{

	snd_soc_runtime_action(rtd, stream, 1);

}

static inline void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd,

				       int stream)

{

	snd_soc_runtime_action(rtd, stream, -1);

}



int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd,

			    struct snd_pcm_hardware *hw, int stream);

sound/soc/atmel/atmel_ssc_dai.c

+2 −2
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int atmel_ssc_suspend(struct snd_soc_component *component) 
	struct atmel_ssc_info *ssc_p;

	struct platform_device *pdev = to_platform_device(component->dev);



	if (!component->active)

	if (!snd_soc_component_active(component))

		return 0;



	ssc_p = &ssc_info[pdev->id];
@@ -793,7 +793,7 @@ static int atmel_ssc_resume(struct snd_soc_component *component) 
	struct platform_device *pdev = to_platform_device(component->dev);

	u32 cr;



	if (!component->active)

	if (!snd_soc_component_active(component))

		return 0;



	ssc_p = &ssc_info[pdev->id];

sound/soc/bcm/bcm2835-i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static void bcm2835_i2s_stop(struct bcm2835_i2s_dev *dev, 
			BCM2835_I2S_CS_A_REG, mask, 0);



	/* Stop also the clock when not SND_SOC_DAIFMT_CONT */

	if (!dai->active && !(dev->fmt & SND_SOC_DAIFMT_CONT))

	if (!snd_soc_dai_active(dai) && !(dev->fmt & SND_SOC_DAIFMT_CONT))

		bcm2835_i2s_stop_clock(dev);

}
@@ -695,7 +695,7 @@ static int bcm2835_i2s_startup(struct snd_pcm_substream *substream, 
{

	struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);



	if (dai->active)

	if (snd_soc_dai_active(dai))

		return 0;



	/* Should this still be running stop it */
@@ -723,7 +723,7 @@ static void bcm2835_i2s_shutdown(struct snd_pcm_substream *substream, 
	bcm2835_i2s_stop(dev, substream, dai);



	/* If both streams are stopped, disable module and clock */

	if (dai->active)

	if (snd_soc_dai_active(dai))

		return;



	/* Disable the module */

CRA Git | Maintained and supported by SUSTech CRA and CCSE