diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-16 15:05:05 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-16 15:05:05 +0300 |
| commit | 0efd7248091aad03ecefaa52c51440ddb780cc2e (patch) | |
| tree | 3741da09b016a37b5b4c01dc87775f9cc7acf04f /include | |
| parent | cc9bdcf2a4f0cedf7b7425a54578a82bf31dd8f9 (diff) | |
| parent | 3527d85b85e65401b7d93073b3ab4e687cdd2521 (diff) | |
| download | linux-0efd7248091aad03ecefaa52c51440ddb780cc2e.tar.xz | |
Merge branch 'topic/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/simple_card.h | 11 | ||||
| -rw-r--r-- | include/sound/simple_card_utils.h | 36 |
2 files changed, 37 insertions, 10 deletions
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index 0399352f3a62..a6a2e1547092 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h @@ -13,16 +13,7 @@ #define __SIMPLE_CARD_H #include <sound/soc.h> - -struct asoc_simple_dai { - const char *name; - unsigned int sysclk; - int slots; - int slot_width; - unsigned int tx_slot_mask; - unsigned int rx_slot_mask; - struct clk *clk; -}; +#include <sound/simple_card_utils.h> struct asoc_simple_card_info { const char *name; diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h new file mode 100644 index 000000000000..86088aed9002 --- /dev/null +++ b/include/sound/simple_card_utils.h @@ -0,0 +1,36 @@ +/* + * simple_card_core.h + * + * Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __SIMPLE_CARD_CORE_H +#define __SIMPLE_CARD_CORE_H + +#include <sound/soc.h> + +struct asoc_simple_dai { + const char *name; + unsigned int sysclk; + int slots; + int slot_width; + unsigned int tx_slot_mask; + unsigned int rx_slot_mask; + struct clk *clk; +}; + +int asoc_simple_card_parse_daifmt(struct device *dev, + struct device_node *node, + struct device_node *codec, + char *prefix, + unsigned int *retfmt); +int asoc_simple_card_set_dailink_name(struct device *dev, + struct snd_soc_dai_link *dai_link, + const char *fmt, ...); +int asoc_simple_card_parse_card_name(struct snd_soc_card *card, + char *prefix); + +#endif /* __SIMPLE_CARD_CORE_H */ |