summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2013-12-23 08:25:38 +0100
committerMark Brown <broonie@linaro.org>2014-01-01 13:24:56 +0100
commit71467e46414d3bab220de77d3d085be0c0aa03e1 (patch)
tree747b3114cce3679c81edc6d10930ef3dbbd95c65
parentASoC: simple-card: Cleanup __asoc_simple_card_dai_init() ret check (diff)
downloadlinux-71467e46414d3bab220de77d3d085be0c0aa03e1.tar.xz
linux-71467e46414d3bab220de77d3d085be0c0aa03e1.zip
ASoC: simple-card: Add device's module clock selection.
Try to get the device's module clock if the dt has no clocks and system-clock-frequency properties. Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/generic/simple-card.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 3ba65bb63439..58c217e403ae 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -90,14 +90,29 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
* dai->sysclk come from
* "clocks = <&xxx>" (if system has common clock)
* or "system-clock-frequency = <xxx>"
+ * or device's module clock.
*/
- clk = of_clk_get(np, 0);
- if (IS_ERR(clk))
+ if (of_property_read_bool(np, "clocks")) {
+ clk = of_clk_get(np, 0);
+ if (IS_ERR(clk)) {
+ ret = PTR_ERR(clk);
+ goto parse_error;
+ }
+
+ dai->sysclk = clk_get_rate(clk);
+ } else if (of_property_read_bool(np, "system-clock-frequency")) {
of_property_read_u32(np,
"system-clock-frequency",
&dai->sysclk);
- else
+ } else {
+ clk = of_clk_get(*node, 0);
+ if (IS_ERR(clk)) {
+ ret = PTR_ERR(clk);
+ goto parse_error;
+ }
+
dai->sysclk = clk_get_rate(clk);
+ }
ret = 0;