diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:43 +0100 |
| commit | 566d4eeff85a8112dddab9d455322e1fcf5defe7 (patch) | |
| tree | b1f4af1d3dbcbf3984d4eae4f2f59ee2e544dd71 /include/sound/soc.h | |
| parent | Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next (diff) | |
| parent | ASoC: Make soc_find_matching_codec() static (diff) | |
| download | linux-dev-566d4eeff85a8112dddab9d455322e1fcf5defe7.tar.xz linux-dev-566d4eeff85a8112dddab9d455322e1fcf5defe7.zip | |
Merge remote-tracking branch 'asoc/topic/dt' into asoc-next
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 b9ee22018352..c9ae1271281e 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); |