From 0cf039cd3bc131cf6c1366cdc68d4e6f94d7b8c9 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Wed, 8 Jan 2014 14:03:43 +0100 Subject: sound: soc/samsung: i2s: Init clock hierarchy only for audio subsystem Clock hierarchy needs to be initialized only for I2S that is a part of Audio Subsystem. Remaining I2S do not need this, so this patch makes the initialization conditional, based on presence of secondary DAI, which is present only in Audio Subsystem I2S block. Signed-off-by: Tomasz Figa --- sound/soc/samsung/i2s.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'sound') diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 54df6db57d1..d7e4006252f 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -993,11 +993,13 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) return -ENXIO; } - /* Set clock hierarchy for audio subsystem */ - ret = clk_set_hierarchy(i2s); - if (ret) { - dev_err(&i2s->pdev->dev, "failed to set clock hierachy.\n"); - return ret; + if (i2s->quirks & QUIRK_SEC_DAI) { + /* Set clock hierarchy for audio subsystem */ + ret = clk_set_hierarchy(i2s); + if (ret) { + dev_err(&i2s->pdev->dev, "failed to set clock hierachy.\n"); + return ret; + } } if (other) { -- cgit v1.2.3