diff options
author | Jyri Sarha <jsarha@ti.com> | 2015-09-09 14:27:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-16 13:00:30 -0400 |
commit | 6131084a0bc966107021d8c89489f9cd1663b902 (patch) | |
tree | c19701035c96d18b0192884e7ed0390fd599f93d /include/sound | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) |
ASoC: simple-card: Add tdm slot mask support to simple-card
Adds DT binding for explicitly choosing a tdm mask for DAI and uses it
in simple-card. The API for snd_soc_of_parse_tdm_slot() has also been
changed.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/simple_card.h | 2 | ||||
-rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index b9b4f289fe6b..0399352f3a62 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h | |||
@@ -19,6 +19,8 @@ struct asoc_simple_dai { | |||
19 | unsigned int sysclk; | 19 | unsigned int sysclk; |
20 | int slots; | 20 | int slots; |
21 | int slot_width; | 21 | int slot_width; |
22 | unsigned int tx_slot_mask; | ||
23 | unsigned int rx_slot_mask; | ||
22 | struct clk *clk; | 24 | struct clk *clk; |
23 | }; | 25 | }; |
24 | 26 | ||
diff --git a/include/sound/soc.h b/include/sound/soc.h index 884e728b09d9..a76622d7bb2f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -1601,6 +1601,8 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card, | |||
1601 | int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, | 1601 | int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, |
1602 | const char *propname); | 1602 | const char *propname); |
1603 | int snd_soc_of_parse_tdm_slot(struct device_node *np, | 1603 | int snd_soc_of_parse_tdm_slot(struct device_node *np, |
1604 | unsigned int *tx_mask, | ||
1605 | unsigned int *rx_mask, | ||
1604 | unsigned int *slots, | 1606 | unsigned int *slots, |
1605 | unsigned int *slot_width); | 1607 | unsigned int *slot_width); |
1606 | void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, | 1608 | void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, |