diff options
| author | Sebastian Reichel | 2014-04-28 16:07:22 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-05-01 19:56:45 +0200 |
| commit | 3ca041ed04734c1709460184f985f5451a813d69 (patch) | |
| tree | 49e48b52a78cce6a918d213b53cd591229c6d1e0 /include/sound | |
| parent | Linux 3.15-rc1 (diff) | |
| download | kernel-qcow2-linux-3ca041ed04734c1709460184f985f5451a813d69.tar.gz kernel-qcow2-linux-3ca041ed04734c1709460184f985f5451a813d69.tar.xz kernel-qcow2-linux-3ca041ed04734c1709460184f985f5451a813d69.zip | |
ASoC: dt: 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: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound')
| -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); |