aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r--include/sound/soc-dapm.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index c46e7d89561d..e09505c5a490 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -348,6 +348,8 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm);
348void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); 348void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);
349int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, 349int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
350 const struct snd_soc_dapm_route *route, int num); 350 const struct snd_soc_dapm_route *route, int num);
351int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,
352 const struct snd_soc_dapm_route *route, int num);
351 353
352/* dapm events */ 354/* dapm events */
353int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, 355int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd,
@@ -429,6 +431,7 @@ struct snd_soc_dapm_path {
429 /* status */ 431 /* status */
430 u32 connect:1; /* source and sink widgets are connected */ 432 u32 connect:1; /* source and sink widgets are connected */
431 u32 walked:1; /* path has been walked */ 433 u32 walked:1; /* path has been walked */
434 u32 weak:1; /* path ignored for power management */
432 435
433 int (*connected)(struct snd_soc_dapm_widget *source, 436 int (*connected)(struct snd_soc_dapm_widget *source,
434 struct snd_soc_dapm_widget *sink); 437 struct snd_soc_dapm_widget *sink);
@@ -444,6 +447,7 @@ struct snd_soc_dapm_widget {
444 char *name; /* widget name */ 447 char *name; /* widget name */
445 char *sname; /* stream name */ 448 char *sname; /* stream name */
446 struct snd_soc_codec *codec; 449 struct snd_soc_codec *codec;
450 struct snd_soc_platform *platform;
447 struct list_head list; 451 struct list_head list;
448 struct snd_soc_dapm_context *dapm; 452 struct snd_soc_dapm_context *dapm;
449 453
@@ -507,10 +511,11 @@ struct snd_soc_dapm_context {
507 511
508 struct device *dev; /* from parent - for debug */ 512 struct device *dev; /* from parent - for debug */
509 struct snd_soc_codec *codec; /* parent codec */ 513 struct snd_soc_codec *codec; /* parent codec */
514 struct snd_soc_platform *platform; /* parent platform */
510 struct snd_soc_card *card; /* parent card */ 515 struct snd_soc_card *card; /* parent card */
511 516
512 /* used during DAPM updates */ 517 /* used during DAPM updates */
513 int dev_power; 518 enum snd_soc_bias_level target_bias_level;
514 struct list_head list; 519 struct list_head list;
515 520
516#ifdef CONFIG_DEBUG_FS 521#ifdef CONFIG_DEBUG_FS