diff options
| author | Sebastian Reichel <sre@kernel.org> | 2013-10-20 17:28:12 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-04-23 17:35:46 +0200 |
| commit | fe62276348a2ccd23a927a9ce3d68592655ade38 (patch) | |
| tree | 2aeda5f150a509a5258c10be675589ffb147eabd /include/sound/soc.h | |
| parent | 5f86d6c78b4662782e405344da71782d355c1063 (diff) | |
| download | linux-fe62276348a2ccd23a927a9ce3d68592655ade38.tar.bz2 | |
ASoC: Allow Aux Codecs to be specified using DT
This patch adds support for specifying auxiliary codecs and
codec configuration via device tree phandles.
This change adds new fields to snd_soc_aux_dev and snd_soc_codec_conf
and adds support for the changes to SoC core methods.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 0b83168d8ff4..d371ae1c7279 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -931,7 +931,12 @@ struct snd_soc_dai_link { }; struct snd_soc_codec_conf { + /* + * specify device either by device name, or by + * DT/OF node, but not both. + */ const char *dev_name; + const struct device_node *of_node; /* * optional map of kcontrol, widget and path name prefixes that are @@ -942,7 +947,13 @@ struct snd_soc_codec_conf { struct snd_soc_aux_dev { const char *name; /* Codec name */ - const char *codec_name; /* for multi-codec */ + + /* + * specify multi-codec either by device name, or by + * DT/OF node, but not both. + */ + const char *codec_name; + const struct device_node *codec_of_node; /* codec/machine specific init - e.g. add machine controls */ int (*init)(struct snd_soc_dapm_context *dapm); |