[alsa-devel] [PATCH 16/49] ASoC: simple-card-core: add asoc_simple_card_init_dai()
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Fri May 20 11:49:04 CEST 2016
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
simple-card is supporting clock/tdm slot initialization.
This patch makes this method simple style standard.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
include/sound/simple_card_core.h | 3 +++
sound/soc/generic/simple-card-core.c | 29 +++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/sound/simple_card_core.h b/include/sound/simple_card_core.h
index d37acee..9146825 100644
--- a/include/sound/simple_card_core.h
+++ b/include/sound/simple_card_core.h
@@ -94,4 +94,7 @@ int asoc_simple_card_init_jack(struct snd_soc_card *card,
void asoc_simple_card_remove_jack(struct asoc_simple_jack *sjack);
+int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
+ struct asoc_simple_dai *simple_dai);
+
#endif /* __SIMPLE_CARD_CORE_H */
diff --git a/sound/soc/generic/simple-card-core.c b/sound/soc/generic/simple-card-core.c
index 86f64da..cc638e9 100644
--- a/sound/soc/generic/simple-card-core.c
+++ b/sound/soc/generic/simple-card-core.c
@@ -331,3 +331,32 @@ void asoc_simple_card_remove_jack(struct asoc_simple_jack *sjack)
snd_soc_jack_free_gpios(&sjack->jack, 1, &sjack->gpio);
}
EXPORT_SYMBOL_GPL(asoc_simple_card_remove_jack);
+
+int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
+ struct asoc_simple_dai *simple_dai)
+{
+ int ret;
+
+ if (simple_dai->sysclk) {
+ ret = snd_soc_dai_set_sysclk(dai, 0, simple_dai->sysclk, 0);
+ if (ret && ret != -ENOTSUPP) {
+ dev_err(dai->dev, "simple-card: set_sysclk error\n");
+ return ret;
+ }
+ }
+
+ if (simple_dai->slots) {
+ ret = snd_soc_dai_set_tdm_slot(dai,
+ simple_dai->tx_slot_mask,
+ simple_dai->rx_slot_mask,
+ simple_dai->slots,
+ simple_dai->slot_width);
+ if (ret && ret != -ENOTSUPP) {
+ dev_err(dai->dev, "simple-card: set_tdm_slot error\n");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
--
1.9.1
More information about the Alsa-devel
mailing list