summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2017-03-23 15:05:26 +0100
committerMark Brown <broonie@kernel.org>2017-03-24 18:46:36 +0000
commit971edb0a0087b65bd3726d23b2dffff405d48f72 (patch)
treea033280d68b138aa440d9523af0aead48c932d4c /sound
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
downloadlinux-971edb0a0087b65bd3726d23b2dffff405d48f72.tar.gz
linux-971edb0a0087b65bd3726d23b2dffff405d48f72.tar.bz2
linux-971edb0a0087b65bd3726d23b2dffff405d48f72.zip
ASoC: simple-card: fix simple_dai clk lookup
The clock needs to be stored in the simple_dai structure, so it can be enabled later on. This has been broken during the conversion to use devm_* functions for the clk lookup. Fixes: e984fd61e860 (ASoC: simple-card: use devm_get_clk_from_child()) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-card-utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 4924575d2e95..343b291fc372 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -115,6 +115,7 @@ int asoc_simple_card_parse_clk(struct device *dev,
clk = devm_get_clk_from_child(dev, node, NULL);
if (!IS_ERR(clk)) {
simple_dai->sysclk = clk_get_rate(clk);
+ simple_dai->clk = clk;
} else if (!of_property_read_u32(node, "system-clock-frequency", &val)) {
simple_dai->sysclk = val;
} else {