Commit a1916ff3 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next

parents 2dd49f8e f2ed6b07
...@@ -222,6 +222,7 @@ struct snd_soc_dai_driver { ...@@ -222,6 +222,7 @@ struct snd_soc_dai_driver {
const char *name; const char *name;
unsigned int id; unsigned int id;
unsigned int base; unsigned int base;
struct snd_soc_dobj dobj;
/* DAI driver callbacks */ /* DAI driver callbacks */
int (*probe)(struct snd_soc_dai *dai); int (*probe)(struct snd_soc_dai *dai);
......
...@@ -798,6 +798,7 @@ struct snd_soc_component { ...@@ -798,6 +798,7 @@ struct snd_soc_component {
unsigned int registered_as_component:1; unsigned int registered_as_component:1;
struct list_head list; struct list_head list;
struct list_head list_aux; /* for auxiliary component of the card */
struct snd_soc_dai_driver *dai_drv; struct snd_soc_dai_driver *dai_drv;
int num_dai; int num_dai;
...@@ -841,6 +842,9 @@ struct snd_soc_component { ...@@ -841,6 +842,9 @@ struct snd_soc_component {
int (*probe)(struct snd_soc_component *); int (*probe)(struct snd_soc_component *);
void (*remove)(struct snd_soc_component *); void (*remove)(struct snd_soc_component *);
/* machine specific init */
int (*init)(struct snd_soc_component *component);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
void (*init_debugfs)(struct snd_soc_component *component); void (*init_debugfs)(struct snd_soc_component *component);
const char *debugfs_prefix; const char *debugfs_prefix;
...@@ -1141,8 +1145,7 @@ struct snd_soc_card { ...@@ -1141,8 +1145,7 @@ struct snd_soc_card {
*/ */
struct snd_soc_aux_dev *aux_dev; struct snd_soc_aux_dev *aux_dev;
int num_aux_devs; int num_aux_devs;
struct snd_soc_pcm_runtime *rtd_aux; struct list_head aux_comp_list;
int num_aux_rtd;
const struct snd_kcontrol_new *controls; const struct snd_kcontrol_new *controls;
int num_controls; int num_controls;
...@@ -1550,6 +1553,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) ...@@ -1550,6 +1553,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->widgets);
INIT_LIST_HEAD(&card->paths); INIT_LIST_HEAD(&card->paths);
INIT_LIST_HEAD(&card->dapm_list); INIT_LIST_HEAD(&card->dapm_list);
INIT_LIST_HEAD(&card->aux_comp_list);
} }
static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc) static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
...@@ -1676,6 +1680,9 @@ int snd_soc_add_dai_link(struct snd_soc_card *card, ...@@ -1676,6 +1680,9 @@ int snd_soc_add_dai_link(struct snd_soc_card *card,
void snd_soc_remove_dai_link(struct snd_soc_card *card, void snd_soc_remove_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link); struct snd_soc_dai_link *dai_link);
int snd_soc_register_dai(struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv);
#include <sound/soc-dai.h> #include <sound/soc-dai.h>
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment