diff options
author | Sebastian Reichel <sre@kernel.org> | 2014-04-28 10:07:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-01 13:56:45 -0400 |
commit | 3ca041ed04734c1709460184f985f5451a813d69 (patch) | |
tree | 49e48b52a78cce6a918d213b53cd591229c6d1e0 /include/sound | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
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 { | |||
931 | }; | 931 | }; |
932 | 932 | ||
933 | struct snd_soc_codec_conf { | 933 | struct snd_soc_codec_conf { |
934 | /* | ||
935 | * specify device either by device name, or by | ||
936 | * DT/OF node, but not both. | ||
937 | */ | ||
934 | const char *dev_name; | 938 | const char *dev_name; |
939 | const struct device_node *of_node; | ||
935 | 940 | ||
936 | /* | 941 | /* |
937 | * optional map of kcontrol, widget and path name prefixes that are | 942 | * optional map of kcontrol, widget and path name prefixes that are |
@@ -942,7 +947,13 @@ struct snd_soc_codec_conf { | |||
942 | 947 | ||
943 | struct snd_soc_aux_dev { | 948 | struct snd_soc_aux_dev { |
944 | const char *name; /* Codec name */ | 949 | const char *name; /* Codec name */ |
945 | const char *codec_name; /* for multi-codec */ | 950 | |
951 | /* | ||
952 | * specify multi-codec either by device name, or by | ||
953 | * DT/OF node, but not both. | ||
954 | */ | ||
955 | const char *codec_name; | ||
956 | const struct device_node *codec_of_node; | ||
946 | 957 | ||
947 | /* codec/machine specific init - e.g. add machine controls */ | 958 | /* codec/machine specific init - e.g. add machine controls */ |
948 | int (*init)(struct snd_soc_dapm_context *dapm); | 959 | int (*init)(struct snd_soc_dapm_context *dapm); |