]> Pileus Git - ~andy/linux/commitdiff
ASoC: simple-card: Add device's module clock selection.
authorXiubo Li <Li.Xiubo@freescale.com>
Mon, 23 Dec 2013 07:25:38 +0000 (15:25 +0800)
committerMark Brown <broonie@linaro.org>
Wed, 1 Jan 2014 12:24:56 +0000 (12:24 +0000)
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>
sound/soc/generic/simple-card.c

index 3ba65bb634399498cc0fcbdf72f2fc0f3933f880..58c217e403ae3d02bdc8a8c24afe0a1c20d7fbaf 100644 (file)
@@ -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;