summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-01 10:57:03 -0700
committerMark Brown <broonie@linaro.org>2014-05-01 10:57:03 -0700
commitf29b542183df7dc74664799c356f9a041f67a10b (patch)
tree2eaafa2253e55c22b08e64f6012f14917bc893a5 /include/sound
parent0265e1ae64ebf1bb55a563599d11fb7376478ae1 (diff)
parent3ca041ed04734c1709460184f985f5451a813d69 (diff)
downloadlinux-stable-f29b542183df7dc74664799c356f9a041f67a10b.tar.gz
linux-stable-f29b542183df7dc74664799c356f9a041f67a10b.tar.bz2
linux-stable-f29b542183df7dc74664799c356f9a041f67a10b.zip
Merge branch 'asoc-dt' into asoc-omap
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 34c34d6e095c..fec6604e4bb8 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -933,7 +933,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
@@ -944,7 +949,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);