Commit 7ba236ce authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: add Component level set_bias_level 



In current ALSA SoC, Codec only has set_bias_level feature.
Codec will be merged into Component in next generation ALSA SoC,
thus current Codec specific feature need to be merged into it.
This is glue patch for it.

Codec driver has .idle_bias_off for dapm bias. But Component
driver doesn't have it, and dapm->idle_bias_off is set as "true".
To keep compatibility, this patch adds "idle_bias_on" instead of
".idle_bias_off" on Component driver.
dapm->idle_bias_off will be set by inverted idle_bias_on.

When we replace Codec to Component, the driver which has
".idle_bias_off = true" is just remove it,
and the driver which doesn't have it will have new
".idle_bias_on = true".

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f523aceb

include/sound/soc.h

+8 −0
Original line number Diff line number Diff line
@@ -816,10 +816,16 @@ struct snd_soc_component_driver { 
	void (*seq_notifier)(struct snd_soc_component *, enum snd_soc_dapm_type,

		int subseq);

	int (*stream_event)(struct snd_soc_component *, int event);

	int (*set_bias_level)(struct snd_soc_component *component,

			      enum snd_soc_bias_level level);



	/* probe ordering - for components with runtime dependencies */

	int probe_order;

	int remove_order;



	/* bits */

	unsigned int idle_bias_on:1;

	unsigned int suspend_bias_off:1;

};



struct snd_soc_component {
@@ -885,6 +891,8 @@ struct snd_soc_component { 
		       int source, unsigned int freq_in, unsigned int freq_out);

	int (*set_jack)(struct snd_soc_component *component,

			struct snd_soc_jack *jack,  void *data);

	int (*set_bias_level)(struct snd_soc_component *component,

			      enum snd_soc_bias_level level);



	/* machine specific init */

	int (*init)(struct snd_soc_component *component);

sound/soc/soc-core.c

+12 −1
Original line number Diff line number Diff line
@@ -3270,6 +3270,14 @@ static void snd_soc_component_drv_pcm_free(struct snd_soc_component *component, 
		component->driver->pcm_free(pcm);

}



static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,

					enum snd_soc_bias_level level)

{

	struct snd_soc_component *component = dapm->component;



	return component->driver->set_bias_level(component, level);

}



static int snd_soc_component_initialize(struct snd_soc_component *component,

	const struct snd_soc_component_driver *driver, struct device *dev)

{
@@ -3297,11 +3305,14 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, 
	dapm->dev = dev;

	dapm->component = component;

	dapm->bias_level = SND_SOC_BIAS_OFF;

	dapm->idle_bias_off = true;

	dapm->idle_bias_off = !driver->idle_bias_on;

	dapm->suspend_bias_off = driver->suspend_bias_off;

	if (driver->seq_notifier)

		dapm->seq_notifier = snd_soc_component_seq_notifier;

	if (driver->stream_event)

		dapm->stream_event = snd_soc_component_stream_event;

	if (driver->set_bias_level)

		dapm->set_bias_level = snd_soc_component_set_bias_level;



	INIT_LIST_HEAD(&component->dai_list);

	mutex_init(&component->io_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE