Commit ce6120cc authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: Decouple DAPM from CODECs 



Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
required when developing ASoC further. Such as for other ASoC components to
have DAPM widgets or when extending DAPM to handle cross-device paths.

This patch decouples DAPM related variables from struct snd_soc_codec and
moves them to new struct snd_soc_dapm_context that is used to encapsulate
DAPM context of a device. ASoC core and API of DAPM functions are modified
to use DAPM context instead of codec.

This patch does not change current functionality and a large part of changes
come because of structure and internal API changes.

Core implementation is from Liam Girdwood <lrg@slimlogic.co.uk> with some
minor core changes, codecs and machine driver conversions from
Jarkko Nikula <jhnikula@gmail.com>.

Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Cliff Cai <cliff.cai@analog.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Ryan Mallon <ryan@bluewatersys.com>
Cc: Timur Tabi <timur@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Jassi Brar <jassi.brar@samsung.com>
Cc: Daniel Gloeckner <dg@emlix.com>
Cc: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 22e2fda5

include/sound/soc-dapm.h

+36 −13
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ enum snd_soc_dapm_type; 
struct snd_soc_dapm_path;

struct snd_soc_dapm_pin;

struct snd_soc_dapm_route;

struct snd_soc_dapm_context;



int dapm_reg_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event);
@@ -324,16 +325,16 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_new_control(struct snd_soc_codec *codec,

int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,

	const struct snd_soc_dapm_widget *widget);

int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,

int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,

	const struct snd_soc_dapm_widget *widget,

	int num);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec);

void snd_soc_dapm_free(struct snd_soc_codec *codec);

int snd_soc_dapm_add_routes(struct snd_soc_codec *codec,

int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm);

void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);



/* dapm events */
@@ -343,17 +344,21 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card); 


/* dapm sys fs - used by the core */

int snd_soc_dapm_sys_add(struct device *dev);

void snd_soc_dapm_debugfs_init(struct snd_soc_codec *codec);

void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm);



/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin);

int snd_soc_dapm_sync(struct snd_soc_codec *codec);

int snd_soc_dapm_force_enable_pin(struct snd_soc_codec *codec,

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,

			    const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,

			     const char *pin);

int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

				const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

				  const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_codec *codec, const char *pin);



/* dapm widget types */

enum snd_soc_dapm_type {
@@ -425,6 +430,7 @@ struct snd_soc_dapm_widget { 
	char *sname;	/* stream name */

	struct snd_soc_codec *codec;

	struct list_head list;

	struct snd_soc_dapm_context *dapm;



	/* dapm control */

	short reg;						/* negative reg = no direct dapm */
@@ -461,4 +467,21 @@ struct snd_soc_dapm_widget { 
	struct list_head power_list;

};



/* DAPM context */

struct snd_soc_dapm_context {

	u32 pop_time;

	struct list_head widgets;

	struct list_head paths;

	enum snd_soc_bias_level bias_level;

	enum snd_soc_bias_level suspend_bias_level;

	struct delayed_work delayed_work;

	unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */



	struct device *dev; /* from parent - for debug */

	struct snd_soc_codec *codec; /* parent codec */

#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_dapm;

#endif

};



#endif

include/sound/soc.h

+2 −7
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ struct soc_enum; 
struct snd_soc_ac97_ops;

struct snd_soc_jack;

struct snd_soc_jack_pin;

#include <sound/soc-dapm.h>



#ifdef CONFIG_GPIOLIB

struct snd_soc_jack_gpio;
@@ -436,7 +437,6 @@ struct snd_soc_codec { 
	/* runtime */

	struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */

	unsigned int active;

	unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */

	unsigned int cache_only:1;  /* Suppress writes to hardware */

	unsigned int cache_sync:1; /* Cache needs to be synced to hardware */

	unsigned int suspended:1; /* Codec is in suspend PM state */
@@ -452,12 +452,7 @@ struct snd_soc_codec { 
	void *reg_cache;



	/* dapm */

	u32 pop_time;

	struct list_head dapm_widgets;

	struct list_head dapm_paths;

	enum snd_soc_bias_level bias_level;

	enum snd_soc_bias_level suspend_bias_level;

	struct delayed_work delayed_work;

	struct snd_soc_dapm_context dapm;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_codec_root;

sound/soc/atmel/playpaq_wm8510.c

+6 −5
Original line number Diff line number Diff line
@@ -318,27 +318,28 @@ static const struct snd_soc_dapm_route intercon[] = { 
static int playpaq_wm8510_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int i;



	/*

	 * Add DAPM widgets

	 */

	for (i = 0; i < ARRAY_SIZE(playpaq_dapm_widgets); i++)

		snd_soc_dapm_new_control(codec, &playpaq_dapm_widgets[i]);

		snd_soc_dapm_new_control(dapm, &playpaq_dapm_widgets[i]);







	/*

	 * Setup audio path interconnects

	 */

	snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));

	snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));







	/* always connected pins */

	snd_soc_dapm_enable_pin(codec, "Int Mic");

	snd_soc_dapm_enable_pin(codec, "Ext Spk");

	snd_soc_dapm_sync(codec);

	snd_soc_dapm_enable_pin(dapm, "Int Mic");

	snd_soc_dapm_enable_pin(dapm, "Ext Spk");

	snd_soc_dapm_sync(dapm);

sound/soc/atmel/sam9g20_wm8731.c

+9 −8
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	printk(KERN_DEBUG
@@ -154,25 +155,25 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) 
	}



	/* Add specific widgets */

	snd_soc_dapm_new_controls(codec, at91sam9g20ek_dapm_widgets,

	snd_soc_dapm_new_controls(dapm, at91sam9g20ek_dapm_widgets,

				  ARRAY_SIZE(at91sam9g20ek_dapm_widgets));

	/* Set up specific audio path interconnects */

	snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));

	snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));



	/* not connected */

	snd_soc_dapm_nc_pin(codec, "RLINEIN");

	snd_soc_dapm_nc_pin(codec, "LLINEIN");

	snd_soc_dapm_nc_pin(dapm, "RLINEIN");

	snd_soc_dapm_nc_pin(dapm, "LLINEIN");



#ifdef ENABLE_MIC_INPUT

	snd_soc_dapm_enable_pin(codec, "Int Mic");

	snd_soc_dapm_enable_pin(dapm, "Int Mic");

#else

	snd_soc_dapm_nc_pin(codec, "Int Mic");

	snd_soc_dapm_nc_pin(dapm, "Int Mic");

#endif



	/* always connected */

	snd_soc_dapm_enable_pin(codec, "Ext Spk");

	snd_soc_dapm_enable_pin(dapm, "Ext Spk");



	snd_soc_dapm_sync(codec);

	snd_soc_dapm_sync(dapm);



	return 0;

}

sound/soc/atmel/snd-soc-afeb9260.c

+7 −6
Original line number Diff line number Diff line
@@ -105,19 +105,20 @@ static const struct snd_soc_dapm_route audio_map[] = { 
static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	/* Add afeb9260 specific widgets */

	snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,

	snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,

				  ARRAY_SIZE(tlv320aic23_dapm_widgets));



	/* Set up afeb9260 specific audio path audio_map */

	snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));

	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));



	snd_soc_dapm_enable_pin(codec, "Headphone Jack");

	snd_soc_dapm_enable_pin(codec, "Line In");

	snd_soc_dapm_enable_pin(codec, "Mic Jack");

	snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

	snd_soc_dapm_enable_pin(dapm, "Line In");

	snd_soc_dapm_enable_pin(dapm, "Mic Jack");



	snd_soc_dapm_sync(codec);

	snd_soc_dapm_sync(dapm);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE