diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-05 01:07:20 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-05 01:07:20 +0000 |
commit | 0af1327ba0393a98263b8d4244f21d1500a52271 (patch) | |
tree | 689aba0d436890fbfe1b688c1ff1636ffc19cec1 /include | |
parent | 1dfcab55e90500468f1a0646a8549e8eaa90cd7a (diff) | |
parent | 3185878a70e721644b0e32ebbc0a039616551949 (diff) |
Merge remote-tracking branch 'asoc/topic/dapm-dt' into asoc-next
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; |