diff options
| author | Tomasz Figa <t.figa@samsung.com> | 2014-01-08 14:03:43 +0100 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:20 +0900 |
| commit | 0cf039cd3bc131cf6c1366cdc68d4e6f94d7b8c9 (patch) | |
| tree | 7e9e4f9a7bf11c105e6d7f15b0583e028d600aae | |
| parent | 3f2823c6dc9fdce0262484b7347b21a4c19d4fa7 (diff) | |
| download | linux-3.10-0cf039cd3bc131cf6c1366cdc68d4e6f94d7b8c9.tar.gz linux-3.10-0cf039cd3bc131cf6c1366cdc68d4e6f94d7b8c9.tar.bz2 linux-3.10-0cf039cd3bc131cf6c1366cdc68d4e6f94d7b8c9.zip | |
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 <t.figa@samsung.com>
| -rw-r--r-- | sound/soc/samsung/i2s.c | 12 |
1 files changed, 7 insertions, 5 deletions
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) { |