diff options
| author | Mark Brown | 2015-04-10 17:09:21 +0200 |
|---|---|---|
| committer | Mark Brown | 2015-04-10 17:09:21 +0200 |
| commit | 1ddca24c532247894eb4430e9315e690306cf860 (patch) | |
| tree | e0021306bdc42615ba304b0ac4dd3db6b73cae55 /include | |
| parent | Merge branch 'topic/delay' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff) | |
| parent | ASoC: fsl-asoc-card: Add snd_soc_of_parse_audio_routing() (diff) | |
| download | kernel-qcow2-linux-1ddca24c532247894eb4430e9315e690306cf860.tar.gz kernel-qcow2-linux-1ddca24c532247894eb4430e9315e690306cf860.tar.xz kernel-qcow2-linux-1ddca24c532247894eb4430e9315e690306cf860.zip | |
Merge branch 'topic/dapm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 0d1ade195628..f66a1ef98a40 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1071,11 +1071,16 @@ struct snd_soc_card { /* * Card-specific routes and widgets. + * Note: of_dapm_xxx for Device Tree; Otherwise for driver build-in. */ const struct snd_soc_dapm_widget *dapm_widgets; int num_dapm_widgets; const struct snd_soc_dapm_route *dapm_routes; int num_dapm_routes; + const struct snd_soc_dapm_widget *of_dapm_widgets; + int num_of_dapm_widgets; + const struct snd_soc_dapm_route *of_dapm_routes; + int num_of_dapm_routes; bool fully_routed; struct work_struct deferred_resume_work; |