[alsa-devel] [PATCH 3/4] ASoC: simple-card: Add system-clock-direction DT parameter to dai nodes
Peter Ujfalusi
peter.ujfalusi at ti.com
Mon Feb 15 15:11:34 CET 2016
From: Jyri Sarha <jsarha at ti.com>
Select dir parameters for set_sysclk calls in the card init phase.
Signed-off-by: Jyri Sarha <jsarha at ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi at ti.com>
---
Documentation/devicetree/bindings/sound/simple-card.txt | 1 +
include/sound/simple_card.h | 1 +
sound/soc/generic/simple-card.c | 14 +++++++++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index cf3979eb3578..1f2cf76d701a 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -84,6 +84,7 @@ Optional CPU/CODEC subnodes properties:
in dai startup() and disabled with
clk_disable_unprepare() in dai
shutdown().
+- system-clock-direction : "in" or "out", default "in"
Example 1 - single DAI link:
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index 0399352f3a62..783bc5499794 100644
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -17,6 +17,7 @@
struct asoc_simple_dai {
const char *name;
unsigned int sysclk;
+ int sysclk_dir;
int slots;
int slot_width;
unsigned int tx_slot_mask;
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 2389ab47e25f..f0d89e6f28a6 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -142,7 +142,8 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
int ret;
if (set->sysclk) {
- ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
+ ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk,
+ set->sysclk_dir);
if (ret && ret != -ENOTSUPP) {
dev_err(dai->dev, "simple-card: set_sysclk error\n");
goto err;
@@ -220,6 +221,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
{
struct of_phandle_args args;
struct clk *clk;
+ const char *str;
u32 val;
int ret;
@@ -249,6 +251,16 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
if (ret)
return ret;
+ ret = of_property_read_string(np, "system-clock-direction", &str);
+ if (ret == 0) {
+ if (!strcmp(str, "out"))
+ dai->sysclk_dir = SND_SOC_CLOCK_OUT;
+ else if (!strcmp(str, "in"))
+ dai->sysclk_dir = SND_SOC_CLOCK_IN;
+ else
+ return -EINVAL;
+ }
+
/*
* Parse dai->sysclk come from "clocks = <&xxx>"
* (if system has common clock)
--
2.7.1
More information about the Alsa-devel
mailing list