diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-23 14:26:10 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-23 14:26:21 +0900 |
| commit | ff2878644eed7765a917a02d0af864697ceaf73e (patch) | |
| tree | d423631b020aaa4a08afea7d6da60c5db348abf5 /include | |
| parent | 66841345073b049c0c194486bac4d7f07266a57e (diff) | |
| parent | 89c6785715592a6b082b3f9f28c27bb14b041c7d (diff) | |
| download | op-kernel-dev-ff2878644eed7765a917a02d0af864697ceaf73e.zip op-kernel-dev-ff2878644eed7765a917a02d0af864697ceaf73e.tar.gz | |
Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
| -rw-r--r-- | include/sound/soc.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 71f27c4..d86e0fc 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -142,6 +142,8 @@ struct snd_soc_dai_ops { * Called by soc_card drivers, normally in their hw_params. */ int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); + int (*of_xlate_tdm_slot_mask)(unsigned int slots, + unsigned int *tx_mask, unsigned int *rx_mask); int (*set_tdm_slot)(struct snd_soc_dai *dai, unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width); diff --git a/include/sound/soc.h b/include/sound/soc.h index 465dc6e..2a878d0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1175,6 +1175,9 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card, const char *propname); int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, const char *propname); +int snd_soc_of_parse_tdm_slot(struct device_node *np, + unsigned int *slots, + unsigned int *slot_width); int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname); unsigned int snd_soc_of_parse_daifmt(struct device_node *np, |
