diff options
| author | Subhransu S. Prusty <subhransu.s.prusty@intel.com> | 2015-06-29 12:36:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-06 07:33:53 -0400 |
| commit | 6dc6db790a67d28e46abefc44ca1a3bd438b2920 (patch) | |
| tree | 79aa746830fe8ef0b403a8c4563e5ab6861a1ac6 | |
| parent | 5406898354ebfb11f49b955fb5e49a62786a542f (diff) | |
ASoC: topology: Add subsequence in topology
Some widgets may need sorting within, So add this support in topology.
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | include/uapi/sound/asoc.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-topology.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 12215205ab8d..7ae13fbc0a3e 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h | |||
| @@ -347,6 +347,7 @@ struct snd_soc_tplg_dapm_widget { | |||
| 347 | __le32 reg; /* negative reg = no direct dapm */ | 347 | __le32 reg; /* negative reg = no direct dapm */ |
| 348 | __le32 shift; /* bits to shift */ | 348 | __le32 shift; /* bits to shift */ |
| 349 | __le32 mask; /* non-shifted mask */ | 349 | __le32 mask; /* non-shifted mask */ |
| 350 | __le32 subseq; /* sort within widget type */ | ||
| 350 | __u32 invert; /* invert the power bit */ | 351 | __u32 invert; /* invert the power bit */ |
| 351 | __u32 ignore_suspend; /* kept enabled over suspend */ | 352 | __u32 ignore_suspend; /* kept enabled over suspend */ |
| 352 | __u16 event_flags; | 353 | __u16 event_flags; |
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 6a547c6dd3a1..9f2b048f1071 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c | |||
| @@ -1351,6 +1351,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, | |||
| 1351 | template.reg = w->reg; | 1351 | template.reg = w->reg; |
| 1352 | template.shift = w->shift; | 1352 | template.shift = w->shift; |
| 1353 | template.mask = w->mask; | 1353 | template.mask = w->mask; |
| 1354 | template.subseq = w->subseq; | ||
| 1354 | template.on_val = w->invert ? 0 : 1; | 1355 | template.on_val = w->invert ? 0 : 1; |
| 1355 | template.off_val = w->invert ? 1 : 0; | 1356 | template.off_val = w->invert ? 1 : 0; |
| 1356 | template.ignore_suspend = w->ignore_suspend; | 1357 | template.ignore_suspend = w->ignore_suspend; |
